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 "ash/test/test_metro_viewer_process_host.h" | 5 #include "ash/test/test_metro_viewer_process_host.h" |
6 | 6 |
7 #include <windef.h> | 7 #include <windef.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/process/process.h" | 10 #include "base/process/process.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 TestMetroViewerProcessHost::~TestMetroViewerProcessHost() { | 22 TestMetroViewerProcessHost::~TestMetroViewerProcessHost() { |
23 } | 23 } |
24 | 24 |
25 void TestMetroViewerProcessHost::TerminateViewer() { | 25 void TestMetroViewerProcessHost::TerminateViewer() { |
26 base::ProcessId viewer_process_id = GetViewerProcessId(); | 26 base::ProcessId viewer_process_id = GetViewerProcessId(); |
27 if (viewer_process_id != base::kNullProcessId) { | 27 if (viewer_process_id != base::kNullProcessId) { |
28 base::Process viewer_process = base::Process::OpenWithAccess( | 28 base::Process viewer_process = base::Process::OpenWithAccess( |
29 viewer_process_id, | 29 viewer_process_id, |
30 PROCESS_QUERY_INFORMATION | SYNCHRONIZE | PROCESS_TERMINATE); | 30 PROCESS_QUERY_INFORMATION | SYNCHRONIZE | PROCESS_TERMINATE); |
31 if (viewer_process.IsValid()) { | 31 if (viewer_process.IsValid()) { |
32 viewer_process.Terminate(0); | 32 viewer_process.Terminate(0, false); |
33 int exit_code; | 33 int exit_code; |
34 viewer_process.WaitForExit(&exit_code); | 34 viewer_process.WaitForExit(&exit_code); |
35 } | 35 } |
36 } | 36 } |
37 } | 37 } |
38 | 38 |
39 void TestMetroViewerProcessHost::OnChannelError() { | 39 void TestMetroViewerProcessHost::OnChannelError() { |
40 closed_unexpectedly_ = true; | 40 closed_unexpectedly_ = true; |
41 aura::RemoteWindowTreeHostWin::Instance()->Disconnected(); | 41 aura::RemoteWindowTreeHostWin::Instance()->Disconnected(); |
42 } | 42 } |
(...skipping 14 matching lines...) Expand all Loading... |
57 void TestMetroViewerProcessHost::OnHandleSearchRequest( | 57 void TestMetroViewerProcessHost::OnHandleSearchRequest( |
58 const base::string16& search_string) { | 58 const base::string16& search_string) { |
59 } | 59 } |
60 | 60 |
61 void TestMetroViewerProcessHost::OnWindowSizeChanged(uint32 width, | 61 void TestMetroViewerProcessHost::OnWindowSizeChanged(uint32 width, |
62 uint32 height) { | 62 uint32 height) { |
63 } | 63 } |
64 | 64 |
65 } // namespace test | 65 } // namespace test |
66 } // namespace ash | 66 } // namespace ash |
OLD | NEW |