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

Unified Diff: chrome/browser/metro_viewer/metro_viewer_process_host_win.cc

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/process_singleton_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metro_viewer/metro_viewer_process_host_win.cc
===================================================================
--- chrome/browser/metro_viewer/metro_viewer_process_host_win.cc (revision 169477)
+++ chrome/browser/metro_viewer/metro_viewer_process_host_win.cc (working copy)
@@ -5,6 +5,7 @@
#include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h"
#include "base/logging.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/ui/ash/ash_init.h"
#include "content/public/browser/browser_thread.h"
@@ -15,6 +16,7 @@
MetroViewerProcessHost::MetroViewerProcessHost(
const std::string& ipc_channel_name) {
+ g_browser_process->AddRefModule();
channel_.reset(new IPC::ChannelProxy(
ipc_channel_name.c_str(),
IPC::Channel::MODE_NAMED_SERVER,
@@ -51,7 +53,8 @@
// 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";
- browser::CloseAllBrowsers();
ananta 2012/11/27 19:17:25 Removed the call to CloseAllBrowsers as it closes
+ g_browser_process->ReleaseModule();
+ chrome::CloseAsh();
}
void MetroViewerProcessHost::OnSetTargetSurface(
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/process_singleton_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698