chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc - Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to 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/aura/chrome_browser_main_extra_parts_aura.cc

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix rebase 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:

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

index c5cf3541f98565c095e65e39d16bffe08dfcf09d..4c5dff59d847b04c4c038d29c10f3f077ec2d8a1 100644

--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

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

#include "chrome/browser/toolkit_extra_parts.h"

#include "chrome/browser/ui/aura/stacking_client_aura.h"

#include "ui/aura/env.h"

-#include "ui/aura/single_display_manager.h"

#include "ui/gfx/screen.h"

#include "ui/views/widget/desktop_aura/desktop_screen.h"

#include "ui/views/widget/desktop_aura/desktop_stacking_client.h"

@@ -38,7 +37,6 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {

{

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,

views::CreateDesktopScreen());

- aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);

stacking_client_.reset(new views::DesktopStackingClient);

aura::client::SetStackingClient(stacking_client_.get());

}