Move window selection logic into WebPage

thoughtbot · May 30, 2012 · 33bc195 · 33bc195
1 parent aaba4d1
commit 33bc195
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/WebPage.cpp b/src/WebPage.cpp
@@ -267,3 +267,10 @@ QString WebPage::getWindowName() {
   else
     return "";
 }
+
+bool WebPage::matchesWindowSelector(QString selector) {
+  return (selector == getWindowName()           ||
+      selector == mainFrame()->title()          ||
+      selector == mainFrame()->url().toString() ||
+      selector == uuid());
+}
diff --git a/src/WebPage.h b/src/WebPage.h
@@ -25,6 +25,7 @@ class WebPage : public QWebPage {
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
     QString getWindowName();
+    bool matchesWindowSelector(QString);
 
   public slots:
     bool shouldInterruptJavaScript();

diff --git a/src/WindowFocus.cpp b/src/WindowFocus.cpp
@@ -26,10 +26,7 @@ void WindowFocus::focusWindow(QString selector) {
   while (pageIterator.hasNext()) {
     WebPage *page = pageIterator.next();
 
-    if (selector == page->getWindowName() ||
-        selector == page->mainFrame()->title() ||
-        selector == page->mainFrame()->url().toString() ||
-        selector == page->uuid()) {
+    if (page->matchesWindowSelector(selector)) {
       success(page);
       return;
     }