OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browser_process_platform_part_aurawin.h" | 5 #include "chrome/browser/browser_process_platform_part_aurawin.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h " | 12 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h " |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "win8/test/test_registrar_constants.h" | |
14 | 15 |
15 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { | 16 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { |
16 } | 17 } |
17 | 18 |
18 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { | 19 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { |
19 } | 20 } |
20 | 21 |
21 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() { | 22 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() { |
22 metro_viewer_process_host_.reset(NULL); | 23 metro_viewer_process_host_.reset(NULL); |
23 } | 24 } |
24 | 25 |
25 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing( | 26 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing( |
26 const CommandLine& command_line) { | 27 const CommandLine& command_line) { |
27 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && | 28 // Check for Windows 8 specific commandlines requesting that this process |
28 command_line.HasSwitch(switches::kViewerConnection) && | 29 // either connect to an existing viewer or launch a new viewer and |
29 !metro_viewer_process_host_.get()) { | 30 // synchronously wait for it to connect. |
30 // Tell the metro viewer process host to connect to the given IPC channel. | 31 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
31 metro_viewer_process_host_.reset( | 32 if (command_line.HasSwitch(switches::kViewerConnection) && |
32 new ChromeMetroViewerProcessHost( | 33 !metro_viewer_process_host_.get()) { |
33 command_line.GetSwitchValueASCII(switches::kViewerConnection))); | 34 // Tell the metro viewer process host to connect to the given IPC channel. |
35 metro_viewer_process_host_.reset( | |
36 new ChromeMetroViewerProcessHost( | |
37 command_line.GetSwitchValueASCII(switches::kViewerConnection))); | |
38 } else if (command_line.HasSwitch(switches::kAshBrowserTests)) { | |
grt (UTC plus 2)
2013/05/29 02:22:51
i'm a little uncomfortable with this test-only cod
gab
2013/05/29 14:52:20
Ya, I agree that this is ugly, especially that I a
grt (UTC plus 2)
2013/05/29 15:51:03
If I understand, yeah, this seems better. For what
gab
2013/05/29 23:09:42
Okay, did that in patch set 6, let me know if you
| |
39 metro_viewer_process_host_.reset( | |
40 new ChromeMetroViewerProcessHost("viewer")); | |
41 CHECK(metro_viewer_process_host_->LaunchViewerAndWaitForConnection( | |
42 win8::test::kDefaultTestAppUserModelId)); | |
43 } | |
34 } | 44 } |
35 } | 45 } |
36 | 46 |
37 void BrowserProcessPlatformPart::AttemptExit() { | 47 void BrowserProcessPlatformPart::AttemptExit() { |
38 // On WinAura, the regular exit path is fine except on Win8+, where Ash might | 48 // On WinAura, the regular exit path is fine except on Win8+, where Ash might |
39 // be active in Metro and won't go away even if all browsers are closed. The | 49 // be active in Metro and won't go away even if all browsers are closed. The |
40 // viewer process, whose host holds a reference to g_browser_process, needs to | 50 // viewer process, whose host holds a reference to g_browser_process, needs to |
41 // be killed as well. | 51 // be killed as well. |
42 BrowserProcessPlatformPartBase::AttemptExit(); | 52 BrowserProcessPlatformPartBase::AttemptExit(); |
43 | 53 |
44 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && | 54 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
45 metro_viewer_process_host_) { | 55 metro_viewer_process_host_) { |
46 base::ProcessId viewer_id = | 56 base::ProcessId viewer_id = |
47 metro_viewer_process_host_->GetViewerProcessId(); | 57 metro_viewer_process_host_->GetViewerProcessId(); |
48 if (viewer_id == base::kNullProcessId) | 58 if (viewer_id == base::kNullProcessId) |
49 return; | 59 return; |
50 // The viewer doesn't hold any state so it is fine to kill it before it | 60 // The viewer doesn't hold any state so it is fine to kill it before it |
51 // cleanly exits. This will trigger MetroViewerProcessHost::OnChannelError() | 61 // cleanly exits. This will trigger MetroViewerProcessHost::OnChannelError() |
52 // which will cleanup references to g_browser_process. | 62 // which will cleanup references to g_browser_process. |
53 bool success = base::KillProcessById(viewer_id, 0, true); | 63 bool success = base::KillProcessById(viewer_id, 0, true); |
54 DCHECK(success); | 64 DCHECK(success); |
55 } | 65 } |
56 } | 66 } |
OLD | NEW |