diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:06:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:06:03 +0000 |
| commit | fe7c487d945c411c41d07b68b5018d4f961d9196 (patch) | |
| tree | faa58489cad15fe2470e5269b69621d30ce9199a /chrome/browser/ui/browser_browsertest.cc | |
| parent | 828a6dfa99115fec7ea4d90be55bfe025f01703c (diff) | |
| download | chromium_src-fe7c487d945c411c41d07b68b5018d4f961d9196.zip chromium_src-fe7c487d945c411c41d07b68b5018d4f961d9196.tar.gz chromium_src-fe7c487d945c411c41d07b68b5018d4f961d9196.tar.bz2 | |
Rename BrowserInit to StartupBrowserCreator, and move into startup subdir.
BUG=none
TEST=none
TBR=sky
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136337
Review URL: https://chromiumcodereview.appspot.com/10356100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index bd88449..0dd7420 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -30,12 +30,12 @@ #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_init.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/fullscreen_controller.h" #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -898,9 +898,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { CommandLine command_line(CommandLine::NO_PROGRAM); command_line.AppendSwitchASCII(switches::kAppId, extension_app->id()); - BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? - BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN; - BrowserInit::LaunchWithProfile launch(FilePath(), command_line, first_run); + StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ? + StartupBrowserCreator::IS_FIRST_RUN : + StartupBrowserCreator::IS_NOT_FIRST_RUN; + StartupBrowserCreator::LaunchWithProfile launch(FilePath(), command_line, + first_run); ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile())); // Check that the new browser has an app name. @@ -1250,9 +1252,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { // Simulate launching again. CommandLine dummy(CommandLine::NO_PROGRAM); - BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? - BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN; - BrowserInit::LaunchWithProfile launch(FilePath(), dummy, first_run); + StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ? + StartupBrowserCreator::IS_FIRST_RUN : + StartupBrowserCreator::IS_NOT_FIRST_RUN; + StartupBrowserCreator::LaunchWithProfile launch(FilePath(), dummy, first_run); launch.profile_ = browser()->profile(); launch.ProcessStartupURLs(std::vector<GURL>()); |