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

Unified Diff: chrome/browser/browser_process_platform_part_aurawin.cc

Issue 227573007: Third part of porting Chrome Ash to Windows 7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lf Created 6 years, 8 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
Index: chrome/browser/browser_process_platform_part_aurawin.cc
diff --git a/chrome/browser/browser_process_platform_part_aurawin.cc b/chrome/browser/browser_process_platform_part_aurawin.cc
index f145439768adaded9745b96da16d6be9f3c5a329..755bbbfe225ed8a4c0a9cb284757ab91adfc6e0a 100644
--- a/chrome/browser/browser_process_platform_part_aurawin.cc
+++ b/chrome/browser/browser_process_platform_part_aurawin.cc
@@ -41,20 +41,18 @@ void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing(
// Check for Windows 8 specific commandlines requesting that this process
// either connect to an existing viewer or launch a new viewer and
// synchronously wait for it to connect.
- if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
- bool launch = command_line.HasSwitch(switches::kViewerLaunchViaAppId);
- bool connect = (launch ||
- (command_line.HasSwitch(switches::kViewerConnect) &&
- !metro_viewer_process_host_.get()));
- if (connect) {
- // Create a host to connect to the Metro viewer process over IPC.
- metro_viewer_process_host_.reset(new ChromeMetroViewerProcessHost());
- if (launch) {
- CHECK(metro_viewer_process_host_->LaunchViewerAndWaitForConnection(
- command_line.GetSwitchValueNative(
- switches::kViewerLaunchViaAppId)));
- }
- }
+ bool launch = command_line.HasSwitch(switches::kViewerLaunchViaAppId);
+ bool connect = (launch ||
+ (command_line.HasSwitch(switches::kViewerConnect) &&
+ !metro_viewer_process_host_.get()));
+ if (!connect)
+ return;
+ // Create a host to connect to the Metro viewer process over IPC.
+ metro_viewer_process_host_.reset(new ChromeMetroViewerProcessHost());
+ if (launch) {
+ CHECK(metro_viewer_process_host_->LaunchViewerAndWaitForConnection(
sky 2014/04/14 13:55:17 We're not going to use the metro viewer code for t
cpu_(ooo_6.6-7.5) 2014/04/14 20:02:06 The current plan includes the viewer process in me
+ command_line.GetSwitchValueNative(
+ switches::kViewerLaunchViaAppId)));
}
}

Powered by Google App Engine
This is Rietveld 408576698