summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:06:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:06:03 +0000
commitfe7c487d945c411c41d07b68b5018d4f961d9196 (patch)
treefaa58489cad15fe2470e5269b69621d30ce9199a /chrome/browser/chrome_browser_main.h
parent828a6dfa99115fec7ea4d90be55bfe025f01703c (diff)
downloadchromium_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/chrome_browser_main.h')
-rw-r--r--chrome/browser/chrome_browser_main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index fb67705..71afa03 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -15,11 +15,10 @@
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/process_singleton.h"
#include "chrome/browser/task_profiler/auto_tracking.h"
-#include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "content/public/browser/browser_main_parts.h"
#include "content/public/browser/browser_thread.h"
-class BrowserInit;
class BrowserProcessImpl;
class ChromeBrowserMainExtraParts;
class FieldTrialSynchronizer;
@@ -27,6 +26,7 @@ class HistogramSynchronizer;
class MetricsService;
class PrefService;
class Profile;
+class StartupBrowserCreator;
class StartupTimeBomb;
class ShutdownWatcherHelper;
class TranslateManager;
@@ -185,7 +185,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// Members initialized after / released before main_message_loop_ ------------
- scoped_ptr<BrowserInit> browser_init_;
+ scoped_ptr<StartupBrowserCreator> browser_creator_;
scoped_ptr<BrowserProcessImpl> browser_process_;
scoped_refptr<HistogramSynchronizer> histogram_synchronizer_;
scoped_refptr<chrome_browser_metrics::TrackingSynchronizer>