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

Side by Side 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, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "chrome/browser/chrome_browser_main.h" 7 #include "chrome/browser/chrome_browser_main.h"
8 #include "chrome/browser/toolkit_extra_parts.h" 8 #include "chrome/browser/toolkit_extra_parts.h"
9 #include "chrome/browser/ui/ash/ash_init.h" 9 #include "chrome/browser/ui/ash/ash_init.h"
10 #include "ui/aura/desktop/desktop_stacking_client.h" 10 #include "ui/aura/desktop/desktop_stacking_client.h"
11 #include "ui/aura/desktop/desktop_screen.h" 11 #include "ui/aura/desktop/desktop_screen.h"
12 #include "ui/aura/env.h" 12 #include "ui/aura/env.h"
13 #include "ui/aura/single_monitor_manager.h" 13 #include "ui/aura/single_display_manager.h"
14 #include "ui/gfx/screen.h" 14 #include "ui/gfx/screen.h"
15 15
16 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() { 16 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
17 } 17 }
18 18
19 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { 19 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {
20 } 20 }
21 21
22 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 22 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
23 if (browser::ShouldOpenAshOnStartup()) { 23 if (browser::ShouldOpenAshOnStartup()) {
24 browser::OpenAsh(); 24 browser::OpenAsh();
25 } else { 25 } else {
26 aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); 26 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
27 stacking_client_.reset(new aura::DesktopStackingClient); 27 stacking_client_.reset(new aura::DesktopStackingClient);
28 gfx::Screen::SetInstance(aura::CreateDesktopScreen()); 28 gfx::Screen::SetInstance(aura::CreateDesktopScreen());
29 } 29 }
30 } 30 }
31 31
32 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 32 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
33 } 33 }
34 34
35 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 35 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
36 browser::CloseAsh(); 36 browser::CloseAsh();
37 } 37 }
38 38
39 namespace browser { 39 namespace browser {
40 40
41 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { 41 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
42 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); 42 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
43 } 43 }
44 44
45 } // namespace browser 45 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698