chrome/browser/ui/ash/ash_util.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix some new gfx::Screen additions 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/notifications/balloon_collection_impl.cc ('K') | « chrome/browser/thumbnails/thumbnail_tab_helper.cc ('k') | chrome/browser/ui/ash/window_positioner.cc » ('j') | chrome/browser/ui/panels/display_settings_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 488cc4c3f8cef178575b9d5369410285ff35d061..0c40be8217827bf5aca234b9336570688a3d32e5 100644

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

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

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

#include "ash/shell.h"

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

#include "ui/aura/root_window.h"

+#include "ui/gfx/screen.h"

oshima 2012/10/10 17:58:23 do you need this?

scottmg 2012/10/10 19:04:47 Done.

namespace chrome {

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

}

void ToggleAshDesktop() {

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

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

OpenAsh();

else