chrome/browser/ui/ash/ash_util.cc - Issue 11146023: Work on separate browser contexts

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/ui/ash/ash_util.cc

Issue 11146023: Work on separate browser contexts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: another busted command line flag Created 8 years, 2 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:

Index: chrome/browser/ui/ash/ash_util.cc

diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc

index 09d9373e9aad08a1d51f7089a37a6579f5f268ea..add9678cf9f6b55f2d58ba7ee061e014562cf387 100644

--- a/chrome/browser/ui/ash/ash_util.cc

+++ b/chrome/browser/ui/ash/ash_util.cc

@@ -6,6 +6,7 @@

#include "ash/shell.h"

#include "chrome/browser/ui/ash/ash_init.h"

+#include "chrome/browser/ui/host_desktop.h"

#include "ui/aura/root_window.h"

namespace chrome {

@@ -36,7 +37,7 @@ bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {

}

void ToggleAshDesktop() {

- // TODO(scottmg): Probably need to force Ash here. http://crbug.com/133312

+ ScopedForceDesktopType force(chrome::HOST_DESKTOP_TYPE_ASH);

if (!ash::Shell::HasInstance())

OpenAsh();

else