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

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

Issue 14576015: In WinAura, also kill the Metro viewer process in AttemptExit(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on top of https://codereview.chromium.org/14576015/ 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_winaura.h" 5 #include "chrome/browser/browser_process_platform_part_winaura.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h"
9 #include "base/process_util.h"
8 #include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h" 10 #include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h"
9 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
10 12
11 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { 13 BrowserProcessPlatformPart::BrowserProcessPlatformPart() {
12 } 14 }
13 15
14 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { 16 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
15 } 17 }
16 18
17 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing( 19 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing(
18 const CommandLine& command_line) { 20 const CommandLine& command_line) {
19 if (command_line.HasSwitch(switches::kViewerConnection) && 21 if (command_line.HasSwitch(switches::kViewerConnection) &&
20 !metro_viewer_process_host_.get()) { 22 !metro_viewer_process_host_.get()) {
21 // Tell the metro viewer process host to connect to the given IPC channel. 23 // Tell the metro viewer process host to connect to the given IPC channel.
22 metro_viewer_process_host_.reset( 24 metro_viewer_process_host_.reset(
23 new MetroViewerProcessHost( 25 new MetroViewerProcessHost(
24 command_line.GetSwitchValueASCII(switches::kViewerConnection))); 26 command_line.GetSwitchValueASCII(switches::kViewerConnection)));
25 } 27 }
26 } 28 }
27 29
28 void BrowserProcessPlatformPart::StartTearDown() { 30 void BrowserProcessPlatformPart::StartTearDown() {
29 } 31 }
30 32
31 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() { 33 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() {
32 metro_viewer_process_host_.reset(NULL); 34 metro_viewer_process_host_.reset();
33 } 35 }
36
37 void BrowserProcessPlatformPart::TerminateMetroViewerProcess() {
38 if (metro_viewer_process_host_) {
39 base::ProcessId viewer_id =
40 metro_viewer_process_host_->GetViewerProcessId();
41 if (viewer_id == base::kNullProcessId)
42 return;
43 // The viewer doesn't hold any state so it is fine to kill it before it
44 // cleanly exits. This will trigger MetroViewerProcessHost::OnChannelError()
45 // which will cleanup references to g_browser_process.
46 bool success = base::KillProcessById(viewer_id, 0, true);
47 DCHECK(success);
48 }
49 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698