Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: trunk/src/chrome/browser/browser_process_impl.h

Issue 14828010: Revert 200576 "Move winaura specific methods and members from ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/browser_process.h ('k') | trunk/src/chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/browser_process_impl.h
===================================================================
--- trunk/src/chrome/browser/browser_process_impl.h (revision 200655)
+++ trunk/src/chrome/browser/browser_process_impl.h (working copy)
@@ -41,6 +41,10 @@
class PolicyService;
};
+#if defined(OS_WIN) && defined(USE_AURA)
+class MetroViewerProcessHost;
+#endif
+
#if defined(OS_MACOSX)
class AppShimHostManager;
#endif
@@ -128,7 +132,12 @@
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
virtual chrome::MediaFileSystemRegistry*
media_file_system_registry() OVERRIDE;
+ virtual void PlatformSpecificCommandLineProcessing(
+ const CommandLine& command_line) OVERRIDE;
virtual bool created_local_state() const OVERRIDE;
+#if defined(OS_WIN) && defined(USE_AURA)
+ virtual void OnMetroViewerProcessTerminated() OVERRIDE;
+#endif
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -283,6 +292,14 @@
scoped_refptr<PluginsResourceService> plugins_resource_service_;
#endif
+#if defined(OS_WIN) && defined(USE_AURA)
+ void PerformInitForWindowsAura(const CommandLine& command_line);
+
+ // Hosts the channel for the Windows 8 metro viewer process which runs in
+ // the ASH environment.
+ scoped_ptr<MetroViewerProcessHost> metro_viewer_process_host_;
+#endif
+
#if defined(OS_MACOSX)
// Hosts the IPC channel factory that App Shims connect to on Mac.
scoped_ptr<AppShimHostManager> app_shim_host_manager_;
« no previous file with comments | « trunk/src/chrome/browser/browser_process.h ('k') | trunk/src/chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698