chrome/browser/chrome_browser_main_win.cc - Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main_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

« chrome/browser/browser_process_impl.h ('K') | « chrome/browser/chrome_browser_main_win.h ('k') | chrome/browser/process_singleton_win.cc » ('j') | chrome/browser/process_singleton_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main_win.cc

===================================================================

--- chrome/browser/chrome_browser_main_win.cc (revision 169477)

+++ chrome/browser/chrome_browser_main_win.cc (working copy)

@@ -50,11 +50,6 @@

#include "ui/base/win/message_box_win.h"

#include "ui/gfx/platform_font_win.h"

-#if defined(USE_AURA)

-#include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h"

-#endif

namespace {

typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(

@@ -227,17 +222,6 @@

ChromeBrowserMainParts::PreMainMessageLoopRun();

removable_device_notifications_window_->Init();

-#if defined(USE_AURA)

- CommandLine& command_line = *CommandLine::ForCurrentProcess();

- if (command_line.HasSwitch(switches::kViewerConnection) &&

- !metro_viewer_process_host_) {

- // Tell the metro viewer process host to connect to the given IPC channel.

- metro_viewer_process_host_.reset(

- new MetroViewerProcessHost(

- command_line.GetSwitchValueASCII(switches::kViewerConnection)));

- }

-#endif

}

// static