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

Side by Side Diff: chrome/browser/chromeos/display/display_configuration_observer.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/display/display_configuration_observer.h" 5 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
6 6
7 #include "ash/common/shell_delegate.h"
8 #include "ash/common/wm_shell.h"
7 #include "ash/display/window_tree_host_manager.h" 9 #include "ash/display/window_tree_host_manager.h"
8 #include "ash/shell.h" 10 #include "ash/shell.h"
9 #include "ash/shell_delegate.h"
10 #include "chrome/browser/chromeos/display/display_preferences.h" 11 #include "chrome/browser/chromeos/display/display_preferences.h"
11 12
12 namespace chromeos { 13 namespace chromeos {
13 14
14 DisplayConfigurationObserver::DisplayConfigurationObserver() { 15 DisplayConfigurationObserver::DisplayConfigurationObserver() {
15 ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); 16 ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
16 } 17 }
17 18
18 DisplayConfigurationObserver::~DisplayConfigurationObserver() { 19 DisplayConfigurationObserver::~DisplayConfigurationObserver() {
19 ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this); 20 ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
20 } 21 }
21 22
22 void DisplayConfigurationObserver::OnDisplaysInitialized() { 23 void DisplayConfigurationObserver::OnDisplaysInitialized() {
23 // Update the display pref with the initial power state. 24 // Update the display pref with the initial power state.
24 if (ash::Shell::GetInstance()->delegate()->IsFirstRunAfterBoot()) 25 if (ash::WmShell::Get()->delegate()->IsFirstRunAfterBoot())
25 StoreDisplayPrefs(); 26 StoreDisplayPrefs();
26 } 27 }
27 28
28 void DisplayConfigurationObserver::OnDisplayConfigurationChanged() { 29 void DisplayConfigurationObserver::OnDisplayConfigurationChanged() {
29 StoreDisplayPrefs(); 30 StoreDisplayPrefs();
30 } 31 }
31 32
32 } // namespace chromeos 33 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698