Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2989)

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index 506a0ea50e80960b7d1c5a0dc34f70c998aeae2e..61acf54fe22a4d30834403c7b3416d9bd674fd07 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -10,7 +10,7 @@
#include "ui/aura/desktop/desktop_stacking_client.h"
#include "ui/aura/desktop/desktop_screen.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"
ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
@@ -23,7 +23,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
if (browser::ShouldOpenAshOnStartup()) {
browser::OpenAsh();
} else {
- aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+ aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
stacking_client_.reset(new aura::DesktopStackingClient);
gfx::Screen::SetInstance(aura::CreateDesktopScreen());
}

Powered by Google App Engine
This is Rietveld 408576698