chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc - Issue 10675011: Rename the remaining usage of Monitor to Display

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 10675011: Rename the remaining usage of Monitor to Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 8 years, 6 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/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 056271d67ac033a8df517d193de2d72d36ab62df..3c9bea2b6a5c67590e4f3b026d33563c6b9a05be 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

@@ -12,7 +12,7 @@

#include "ui/aura/desktop/desktop_screen.h"

#include "ui/aura/desktop/desktop_stacking_client.h"

#include "ui/aura/env.h"

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

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

#include "ui/gfx/screen.h"

#include "ui/views/widget/native_widget_aura.h"

#if defined(OS_LINUX)

@@ -30,7 +30,7 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {

void ChromeBrowserMainExtraPartsAura::PreProfileInit() {

#if !defined(USE_ASH)

gfx::Screen::SetInstance(aura::CreateDesktopScreen());

- aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);

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

stacking_client_.reset(new aura::DesktopStackingClient);

#endif // !USE_ASH