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

Side by Side Diff: chrome/browser/browser_process_platform_part_aurawin.cc

Issue 14629025: Create MetroViewerProcessHost as a common base for TestMetroViewerProcessHost and ChromeMetroViewer… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge before dcommit 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/metro_viewer_process_host_win.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 14
15 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { 15 BrowserProcessPlatformPart::BrowserProcessPlatformPart() {
16 } 16 }
17 17
18 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { 18 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
19 } 19 }
20 20
21 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() { 21 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() {
22 metro_viewer_process_host_.reset(NULL); 22 metro_viewer_process_host_.reset(NULL);
23 } 23 }
24 24
25 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing( 25 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing(
26 const CommandLine& command_line) { 26 const CommandLine& command_line) {
27 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && 27 if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
28 command_line.HasSwitch(switches::kViewerConnection) && 28 command_line.HasSwitch(switches::kViewerConnection) &&
29 !metro_viewer_process_host_.get()) { 29 !metro_viewer_process_host_.get()) {
30 // Tell the metro viewer process host to connect to the given IPC channel. 30 // Tell the metro viewer process host to connect to the given IPC channel.
31 metro_viewer_process_host_.reset( 31 metro_viewer_process_host_.reset(
32 new MetroViewerProcessHost( 32 new ChromeMetroViewerProcessHost(
33 command_line.GetSwitchValueASCII(switches::kViewerConnection))); 33 command_line.GetSwitchValueASCII(switches::kViewerConnection)));
34 } 34 }
35 } 35 }
36 36
37 void BrowserProcessPlatformPart::AttemptExit() { 37 void BrowserProcessPlatformPart::AttemptExit() {
38 // On WinAura, the regular exit path is fine except on Win8+, where Ash might 38 // 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 39 // 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 40 // viewer process, whose host holds a reference to g_browser_process, needs to
41 // be killed as well. 41 // be killed as well.
42 BrowserProcessPlatformPartBase::AttemptExit(); 42 BrowserProcessPlatformPartBase::AttemptExit();
43 43
44 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && 44 if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
45 metro_viewer_process_host_) { 45 metro_viewer_process_host_) {
46 base::ProcessId viewer_id = 46 base::ProcessId viewer_id =
47 metro_viewer_process_host_->GetViewerProcessId(); 47 metro_viewer_process_host_->GetViewerProcessId();
48 if (viewer_id == base::kNullProcessId) 48 if (viewer_id == base::kNullProcessId)
49 return; 49 return;
50 // The viewer doesn't hold any state so it is fine to kill it before it 50 // The viewer doesn't hold any state so it is fine to kill it before it
51 // cleanly exits. This will trigger MetroViewerProcessHost::OnChannelError() 51 // cleanly exits. This will trigger MetroViewerProcessHost::OnChannelError()
52 // which will cleanup references to g_browser_process. 52 // which will cleanup references to g_browser_process.
53 bool success = base::KillProcessById(viewer_id, 0, true); 53 bool success = base::KillProcessById(viewer_id, 0, true);
54 DCHECK(success); 54 DCHECK(success);
55 } 55 }
56 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698