diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:29:32 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:29:32 +0000 |
| commit | 7cad6b0d55995c9775764e7fae0b27526f283191 (patch) | |
| tree | a4100559f070733d40b69fc69c15362e31392fb8 /chrome/browser/browser_process_impl.h | |
| parent | b5f388ab477cc8fa76360002e9cbbd12f82f4e65 (diff) | |
| download | chromium_src-7cad6b0d55995c9775764e7fae0b27526f283191.zip chromium_src-7cad6b0d55995c9775764e7fae0b27526f283191.tar.gz chromium_src-7cad6b0d55995c9775764e7fae0b27526f283191.tar.bz2 | |
Create instance of ProfileHelper that will track active user instance on Chrome OS.
Upcoming CL: ProfileHelper will provide mapping from user_id to Profile.
BUG=180903
TEST=Signing in with multiple users work with --multi-profiles
Review URL: https://codereview.chromium.org/14403013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
| -rw-r--r-- | chrome/browser/browser_process_impl.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 7c44781..b1b8577 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -83,9 +83,7 @@ class BrowserProcessImpl : public BrowserProcess, virtual PrefService* local_state() OVERRIDE; virtual net::URLRequestContextGetter* system_request_context() OVERRIDE; virtual chrome_variations::VariationsService* variations_service() OVERRIDE; -#if defined(OS_CHROMEOS) - virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE; -#endif // defined(OS_CHROMEOS) + virtual BrowserProcessPlatformPart* platform_part() OVERRIDE; virtual extensions::EventRouterForwarder* extension_event_router_forwarder() OVERRIDE; virtual NotificationUIManager* notification_ui_manager() OVERRIDE; @@ -148,9 +146,6 @@ class BrowserProcessImpl : public BrowserProcess, private: void CreateMetricsService(); void CreateWatchdogThread(); -#if defined(OS_CHROMEOS) - void InitializeWebSocketProxyThread(); -#endif void CreateProfileManager(); void CreateLocalState(); void CreateViewedPageTracker(); @@ -288,9 +283,6 @@ class BrowserProcessImpl : public BrowserProcess, void RestartBackgroundInstance(); #endif // defined(OS_WIN) || defined(OS_LINUX) && !defined(OS_CHROMEOS) -#if defined(OS_CHROMEOS) - scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_; -#endif // component updater is normally not used under ChromeOS due // to concerns over integrity of data shared between profiles, // but some users of component updater only install per-user. @@ -315,6 +307,8 @@ class BrowserProcessImpl : public BrowserProcess, scoped_ptr<AppShimHostManager> app_shim_host_manager_; #endif + scoped_ptr<BrowserProcessPlatformPart> platform_part_; + // TODO(eroman): Remove this when done debugging 113031. This tracks // the callstack which released the final module reference count. base::debug::StackTrace release_last_reference_callstack_; |