diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 09:53:19 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 09:53:19 +0000 |
| commit | 0665ebe68556905683649f70a70560045d8c86f0 (patch) | |
| tree | 2d204eef708f9725af9e5f2d2404eaa245e5e767 /chrome/browser/browser_commands_unittest.cc | |
| parent | b67648a6cf258f921e2ca57ab221a470e84c7519 (diff) | |
| download | chromium_src-0665ebe68556905683649f70a70560045d8c86f0.zip chromium_src-0665ebe68556905683649f70a70560045d8c86f0.tar.gz chromium_src-0665ebe68556905683649f70a70560045d8c86f0.tar.bz2 | |
Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls.
Introducing chrome::GetTotalBrowserCount() in browser_finder.cc which counts browsers across all desktops and profiles (this is the desired count for most BrowserList::empty() and BrowserList::size() consumers).
Otherwise calling a specific BrowserListImpl's size() when appropriate.
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/12212120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_commands_unittest.cc')
| -rw-r--r-- | chrome/browser/browser_commands_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 15155a8..1422469 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" @@ -76,13 +76,13 @@ TEST_F(BrowserCommandsTest, DuplicateTab) { EXPECT_EQ(3, orig_controller.GetEntryCount()); EXPECT_TRUE(orig_controller.GetPendingEntry()); - size_t initial_window_count = BrowserList::size(); + size_t initial_window_count = chrome::GetTotalBrowserCount(); // Duplicate the tab. chrome::ExecuteCommand(browser(), IDC_DUPLICATE_TAB); // The duplicated tab should not end up in a new window. - size_t window_count = BrowserList::size(); + size_t window_count = chrome::GetTotalBrowserCount(); ASSERT_EQ(initial_window_count, window_count); // And we should have a newly duplicated tab. @@ -113,13 +113,13 @@ TEST_F(BrowserCommandsTest, ViewSource) { EXPECT_EQ(1, orig_controller.GetEntryCount()); EXPECT_TRUE(orig_controller.GetPendingEntry()); - size_t initial_window_count = BrowserList::size(); + size_t initial_window_count = chrome::GetTotalBrowserCount(); // View Source. chrome::ExecuteCommand(browser(), IDC_VIEW_SOURCE); // The view source tab should not end up in a new window. - size_t window_count = BrowserList::size(); + size_t window_count = chrome::GetTotalBrowserCount(); ASSERT_EQ(initial_window_count, window_count); // And we should have a newly duplicated tab. |