diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 20:48:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 20:48:26 +0000 |
| commit | cc2806854ca9c81d8175a2c318f5a6814a884792 (patch) | |
| tree | 0c1cc6fa14290c8dfac05ebe1965ac0ab750b274 /chrome/browser/app_controller_mac.mm | |
| parent | a55fa8c0dc2763ce42c8c08fbb7aa92501744b39 (diff) | |
| download | chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.zip chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.tar.gz chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.tar.bz2 | |
Extract StartupTabs and startup types from StartupBrowserCreator.
BUG=none
TEST=none
TBR=sky
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136573
Review URL: https://chromiumcodereview.appspot.com/10384106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 1a9329c..5d676e5 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -40,6 +40,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" +#include "chrome/browser/ui/startup/startup_browser_creator_impl.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -999,8 +1000,8 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; StartupBrowserCreator browser_creator; browser_creator.LaunchBrowser( command_line, [self lastProfile], FilePath(), - StartupBrowserCreator::IS_NOT_PROCESS_STARTUP, - StartupBrowserCreator::IS_NOT_FIRST_RUN, &return_code); + browser::startup::IS_NOT_PROCESS_STARTUP, + browser::startup::IS_NOT_FIRST_RUN, &return_code); } // We've handled the reopen event, so return NO to tell AppKit not @@ -1105,10 +1106,9 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; } CommandLine dummy(CommandLine::NO_PROGRAM); - StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ? - StartupBrowserCreator::IS_FIRST_RUN : - StartupBrowserCreator::IS_NOT_FIRST_RUN; - StartupBrowserCreator::LaunchWithProfile launch(FilePath(), dummy, first_run); + browser::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? + browser::startup::IS_FIRST_RUN : browser::startup::IS_NOT_FIRST_RUN; + StartupBrowserCreatorImpl launch(FilePath(), dummy, first_run); launch.OpenURLsInBrowser(browser, false, urls); } |