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

Unified Diff: chrome/browser/browser_process_impl.h

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
Index: chrome/browser/browser_process_impl.h
===================================================================
--- chrome/browser/browser_process_impl.h (revision 169477)
+++ chrome/browser/browser_process_impl.h (working copy)
@@ -39,6 +39,10 @@
class PolicyService;
};
+#if defined(OS_WIN) && defined(USE_AURA)
+class MetroViewerProcessHost;
+#endif
+
// Real implementation of BrowserProcess that creates and returns the services.
class BrowserProcessImpl : public BrowserProcess,
public base::NonThreadSafe {
@@ -117,6 +121,8 @@
virtual ComponentUpdateService* component_updater() OVERRIDE;
virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
+ virtual void PlatformSpecificCommandLineProcessing(
+ const CommandLine& command_line) OVERRIDE;
private:
void CreateMetricsService();
@@ -264,6 +270,14 @@
#if defined(ENABLE_PLUGIN_INSTALLATION)
scoped_refptr<PluginsResourceService> plugins_resource_service_;
#endif
+
+#if defined(OS_WIN) && defined(USE_AURA)
+ void PerformInitForWindowsAura(const CommandLine& command_line);
Ben Goodger (Google) 2012/11/27 16:56:41 nit: NL after
ananta 2012/11/27 19:16:03 Done.
+ // Hosts the channel for the Windows 8 metro viewer process which runs in
+ // the ASH environment.
+ scoped_ptr<MetroViewerProcessHost> metro_viewer_process_host_;
+#endif
+
// 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_;

Powered by Google App Engine
This is Rietveld 408576698