diff options
| -rw-r--r-- | chrome/browser/browser.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/browser_list.cc | 54 | ||||
| -rw-r--r-- | chrome/browser/browser_list.h | 12 |
3 files changed, 37 insertions, 34 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 60d08c8..295beff 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1616,8 +1616,7 @@ void Browser::DuplicateContentsAt(int index) { } else { Browser* browser = NULL; if (type_ & TYPE_APP) { - browser = Browser::CreateForApp(app_name_, profile_, - !!(type_ & TYPE_POPUP)); + browser = Browser::CreateForApp(app_name_, profile_, type_ & TYPE_POPUP); } else if (type_ == TYPE_POPUP) { browser = Browser::CreateForPopup(profile_); } @@ -1974,7 +1973,7 @@ void Browser::DetachContents(TabContents* source) { bool Browser::IsPopup(TabContents* source) { // A non-tabbed BROWSER is an unconstrained popup. - return !!(type() & TYPE_POPUP); + return (type() & TYPE_POPUP); } void Browser::ToolbarSizeChanged(TabContents* source, bool is_animating) { diff --git a/chrome/browser/browser_list.cc b/chrome/browser/browser_list.cc index c5ef49c..aba80b7 100644 --- a/chrome/browser/browser_list.cc +++ b/chrome/browser/browser_list.cc @@ -79,16 +79,6 @@ class BrowserActivityObserver : public NotificationObserver { BrowserActivityObserver* activity_observer = NULL; -// Returns true if the specified |browser| has a matching profile and type to -// those specified. If |any_type| is true, only |profile| must be matched. -bool BrowserMatchesProfileAndType(Browser* browser, - Profile* profile, - Browser::Type type, - bool any_type) { - return (any_type || browser->type() == type) && - browser->profile() == profile; -} - } // namespace BrowserList::list_type BrowserList::browsers_; @@ -252,10 +242,8 @@ void BrowserList::WindowsSessionEnding() { bool BrowserList::HasBrowserWithProfile(Profile* profile) { BrowserList::const_iterator iter; for (size_t i = 0; i < browsers_.size(); ++i) { - if (BrowserMatchesProfileAndType(browsers_[i], profile, - Browser::TYPE_NORMAL, true)) { + if (browsers_[i]->profile() == profile) return true; - } } return false; } @@ -284,28 +272,44 @@ Browser* BrowserList::GetLastActive() { Browser* BrowserList::GetLastActiveWithProfile(Profile* p) { list_type::reverse_iterator browser = last_active_browsers_.rbegin(); for (; browser != last_active_browsers_.rend(); ++browser) { - if (BrowserMatchesProfileAndType(*browser, p, Browser::TYPE_NORMAL, true)) + if ((*browser)->profile() == p) { return *browser; + } } + return NULL; } // static Browser* BrowserList::FindBrowserWithType(Profile* p, Browser::Type t) { - list_type::reverse_iterator browser = last_active_browsers_.rbegin(); - for (; browser != last_active_browsers_.rend(); ++browser) { - if (BrowserMatchesProfileAndType(*browser, p, t, false)) - return *browser; + Browser* last_active = GetLastActive(); + if (last_active && last_active->profile() == p && last_active->type() == t) + return last_active; + + BrowserList::const_iterator i; + for (i = BrowserList::begin(); i != BrowserList::end(); ++i) { + if (*i == last_active) + continue; + + if ((*i)->profile() == p && (*i)->type() == t) + return *i; } return NULL; } // static Browser* BrowserList::FindBrowserWithProfile(Profile* p) { - list_type::reverse_iterator browser = last_active_browsers_.rbegin(); - for (; browser != last_active_browsers_.rend(); ++browser) { - if (BrowserMatchesProfileAndType(*browser, p, Browser::TYPE_NORMAL, true)) - return *browser; + Browser* last_active = GetLastActive(); + if (last_active && last_active->profile() == p) + return last_active; + + BrowserList::const_iterator i; + for (i = BrowserList::begin(); i != BrowserList::end(); ++i) { + if (*i == last_active) + continue; + + if ((*i)->profile() == p) + return *i; } return NULL; } @@ -325,8 +329,8 @@ size_t BrowserList::GetBrowserCountForType(Profile* p, Browser::Type type) { BrowserList::const_iterator i; size_t result = 0; for (i = BrowserList::begin(); i != BrowserList::end(); ++i) { - if (BrowserMatchesProfileAndType(*i, p, type, false)) - ++result; + if ((*i)->profile() == p && (*i)->type() == type) + result++; } return result; } @@ -336,7 +340,7 @@ size_t BrowserList::GetBrowserCount(Profile* p) { BrowserList::const_iterator i; size_t result = 0; for (i = BrowserList::begin(); i != BrowserList::end(); ++i) { - if (BrowserMatchesProfileAndType(*i, p, Browser::TYPE_NORMAL, true)) + if ((*i)->profile() == p) result++; } return result; diff --git a/chrome/browser/browser_list.h b/chrome/browser/browser_list.h index 45a0246..b510b8c 100644 --- a/chrome/browser/browser_list.h +++ b/chrome/browser/browser_list.h @@ -58,14 +58,14 @@ class BrowserList { // open browser owned by |profile| is returned. If none exist, returns NULL. static Browser* GetLastActiveWithProfile(Profile *profile); - // Find an existing browser window with the provided type. Searches in the - // order of last activation. Only browsers that have been active can be - // returned. Returns NULL if no such browser currently exists. + // Find an existing browser window with the provided type. If the last active + // has the right type, it is returned. Otherwise, the next available browser + // is returned. Returns NULL if no such browser currently exists. static Browser* FindBrowserWithType(Profile* p, Browser::Type t); - // Find an existing browser window with the provided profile. Searches in the - // order of last activation. Only browsers that have been active can be - // returned. Returns NULL if no such browser currently exists. + // Find an existing browser window with the provided profile. If the last + // active has the right profile, it is returned. Returns NULL if no such + // browser currently exists. static Browser* FindBrowserWithProfile(Profile* p); // Find an existing browser with the provided ID. Returns NULL if no such |