diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 01:17:41 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 01:17:41 +0000 |
| commit | c987a24655fedc08f1e04ee79e06e3f0df25d03a (patch) | |
| tree | 5c1516372e1c2f6e8738c8168240c2784e2eb133 /chrome/browser/ui/panels | |
| parent | 160b8f609544fed63af64d1c24e4a70dda725e0d (diff) | |
| download | chromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.zip chromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.tar.gz chromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.tar.bz2 | |
Remove kDefaultHostDesktopType from browser_finder.cc.
This forces GetBrowserCount() and GetTabbedBrowserCount() to also take HostDesktopType; changed all consumers to provide desktop context in their query.
Introducing GetTotalBrowserCountForProfile() which is like GetBrowserCount(), but cummulative over all desktops; used in two scenarios where the caller of the old GetBrowserCount() actually wanted to know whether all browsers for a given profile were gone from the p.o.v. of the browser process (i.e. accross all desktops).
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/12315094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/panels')
| -rw-r--r-- | chrome/browser/ui/panels/panel_browsertest.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 63547e7..dbc2235 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -1701,7 +1701,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevTools) { // Open devtools. size_t num_browsers = 1; - EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile())); + EXPECT_EQ(num_browsers, chrome::GetBrowserCount( + browser()->profile(), + browser()->host_desktop_type())); content::WindowedNotificationObserver signal( chrome::NOTIFICATION_BROWSER_WINDOW_READY, content::NotificationService::AllSources()); @@ -1710,7 +1712,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevTools) { // Check that the new browser window that opened is dev tools window. ++num_browsers; - EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile())); + EXPECT_EQ(num_browsers, chrome::GetBrowserCount( + browser()->profile(), + browser()->host_desktop_type())); for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) { if (*iter == browser()) continue; @@ -1737,7 +1741,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevToolsConsole) { // Open devtools console. size_t num_browsers = 1; - EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile())); + EXPECT_EQ(num_browsers, chrome::GetBrowserCount( + browser()->profile(), + browser()->host_desktop_type())); content::WindowedNotificationObserver signal( chrome::NOTIFICATION_BROWSER_WINDOW_READY, content::NotificationService::AllSources()); @@ -1746,7 +1752,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevToolsConsole) { // Check that the new browser window that opened is dev tools window. ++num_browsers; - EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile())); + EXPECT_EQ(num_browsers, chrome::GetBrowserCount( + browser()->profile(), + browser()->host_desktop_type())); for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) { if (*iter == browser()) continue; |