Index: chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
diff --git a/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
similarity index 69% |
rename from chrome/browser/metro_viewer/metro_viewer_process_host_win.cc |
rename to chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
index b2c2d218c3c6990181fbe27d4c8e9d36cfe25e45..03385f70e96f9f8be58e7e6dac2773a50bcf7fcf 100644 |
--- a/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc |
+++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc |
@@ -2,9 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h" |
+#include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h" |
#include "base/logging.h" |
+#include "base/memory/ref_counted.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/browser_process_platform_part_aurawin.h" |
#include "chrome/browser/ui/ash/ash_init.h" |
@@ -17,9 +18,7 @@ |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/web_contents.h" |
-#include "ipc/ipc_channel_proxy.h" |
#include "ui/aura/remote_root_window_host_win.h" |
-#include "ui/metro_viewer/metro_viewer_messages.h" |
#include "ui/surface/accelerated_surface_win.h" |
namespace { |
@@ -42,43 +41,16 @@ void CloseOpenAshBrowsers() { |
} // namespace |
- |
-MetroViewerProcessHost::MetroViewerProcessHost( |
- const std::string& ipc_channel_name) { |
+ChromeMetroViewerProcessHost::ChromeMetroViewerProcessHost( |
+ const std::string& ipc_channel_name) |
+ : MetroViewerProcessHost( |
+ ipc_channel_name, |
+ content::BrowserThread::GetMessageLoopProxyForThread( |
+ content::BrowserThread::IO)) { |
g_browser_process->AddRefModule(); |
- channel_.reset(new IPC::ChannelProxy( |
- ipc_channel_name.c_str(), |
- IPC::Channel::MODE_NAMED_SERVER, |
- this, |
- content::BrowserThread::GetMessageLoopProxyForThread( |
- content::BrowserThread::IO))); |
-} |
- |
-MetroViewerProcessHost::~MetroViewerProcessHost() { |
-} |
- |
-base::ProcessId MetroViewerProcessHost::GetViewerProcessId() { |
- if (channel_) |
- return channel_->peer_pid(); |
- return base::kNullProcessId; |
-} |
- |
-bool MetroViewerProcessHost::Send(IPC::Message* msg) { |
- return channel_->Send(msg); |
-} |
- |
-bool MetroViewerProcessHost::OnMessageReceived(const IPC::Message& message) { |
- DCHECK(CalledOnValidThread()); |
- bool handled = true; |
- IPC_BEGIN_MESSAGE_MAP(MetroViewerProcessHost, message) |
- IPC_MESSAGE_HANDLER(MetroViewerHostMsg_SetTargetSurface, OnSetTargetSurface) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
- IPC_END_MESSAGE_MAP() |
- return handled ? true : |
- aura::RemoteRootWindowHostWin::Instance()->OnMessageReceived(message); |
} |
-void MetroViewerProcessHost::OnChannelError() { |
+void ChromeMetroViewerProcessHost::OnChannelError() { |
// TODO(cpu): At some point we only close the browser. Right now this |
// is very convenient for developing. |
DLOG(INFO) << "viewer channel error : Quitting browser"; |
@@ -97,7 +69,7 @@ void MetroViewerProcessHost::OnChannelError() { |
g_browser_process->platform_part()->OnMetroViewerProcessTerminated(); |
} |
-void MetroViewerProcessHost::OnSetTargetSurface( |
+void ChromeMetroViewerProcessHost::OnSetTargetSurface( |
gfx::NativeViewId target_surface) { |
DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface; |
HWND hwnd = reinterpret_cast<HWND>(target_surface); |