diff options
Diffstat (limited to 'chrome/browser/ui')
4 files changed, 7 insertions, 20 deletions
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc index c467329..f4eba24 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc @@ -24,7 +24,7 @@ #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" #include "chrome/browser/ui/browser.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/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/extensions/shell_window.h" @@ -857,7 +857,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPerAppAppBrowserTestNoDefaultBrowser, WindowedAppDoesNotAddToBrowser) { // Get the number of items in the browser menu. size_t items = NumberOfDetectedLauncherBrowsers(); - size_t running_browser = BrowserList::size(); + size_t running_browser = chrome::GetTotalBrowserCount(); EXPECT_EQ(0u, items); EXPECT_EQ(0u, running_browser); @@ -865,13 +865,13 @@ IN_PROC_BROWSER_TEST_F(LauncherPerAppAppBrowserTestNoDefaultBrowser, // No new browser should get detected, even though one more is running. EXPECT_EQ(0u, NumberOfDetectedLauncherBrowsers()); - EXPECT_EQ(++running_browser, BrowserList::size()); + EXPECT_EQ(++running_browser, chrome::GetTotalBrowserCount()); LoadAndLaunchExtension("app1", extension_misc::LAUNCH_TAB, NEW_WINDOW); // A new browser should get detected and one more should be running. EXPECT_GE(NumberOfDetectedLauncherBrowsers(), 1u); - EXPECT_EQ(++running_browser, BrowserList::size()); + EXPECT_EQ(++running_browser, chrome::GetTotalBrowserCount()); } diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index d1af425..ef5f75f 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc @@ -57,16 +57,6 @@ void BrowserList::CloseAllBrowsersWithProfile(Profile* profile) { } // static -bool BrowserList::empty() { - return GetNativeList()->empty(); -} - -// static -size_t BrowserList::size() { - return GetNativeList()->size(); -} - -// static void BrowserList::SetLastActive(Browser* browser) { chrome::BrowserListImpl::GetInstance(browser->host_desktop_type())-> SetLastActive(browser); diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h index 8b3ed14..f3103cf 100644 --- a/chrome/browser/ui/browser_list.h +++ b/chrome/browser/ui/browser_list.h @@ -38,9 +38,6 @@ class BrowserList { // Closes all browsers for |profile| across all desktops. static void CloseAllBrowsersWithProfile(Profile* profile); - static bool empty(); - static size_t size(); - // Returns iterated access to list of open browsers ordered by when // they were last active. The underlying data structure is a vector // and we push_back on recent access so a reverse iterator gives the diff --git a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm index 8b28224..096a8f0 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_finder.h" #import "chrome/browser/ui/cocoa/one_click_signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" @@ -80,9 +80,9 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninDialogControllerTest, Close) { // Test that clicking the learn more link opens a new window. IN_PROC_BROWSER_TEST_F(OneClickSigninDialogControllerTest, LearnMore) { - EXPECT_EQ(1u, BrowserList::size()); + EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); [controller_->view_controller() textView:nil clickedOnLink:nil atIndex:0]; - EXPECT_EQ(2u, BrowserList::size()); + EXPECT_EQ(2u, chrome::GetTotalBrowserCount()); } |