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

Side by Side Diff: chrome/browser/chromeos/power/output_observer.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/chromeos/power/output_observer.h" 5 #include "chrome/browser/chromeos/power/output_observer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chromeos/dbus/dbus_thread_manager.h" 8 #include "chromeos/dbus/dbus_thread_manager.h"
9 #include "chromeos/monitor/output_configurator.h" 9 #include "chromeos/display/output_configurator.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 12
13 OutputObserver::OutputObserver() { 13 OutputObserver::OutputObserver() {
14 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); 14 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
15 } 15 }
16 16
17 OutputObserver::~OutputObserver() { 17 OutputObserver::~OutputObserver() {
18 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); 18 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
19 } 19 }
20 20
21 void OutputObserver::ScreenPowerSet(bool power_on, bool all_displays) { 21 void OutputObserver::ScreenPowerSet(bool power_on, bool all_displays) {
22 ash::Shell::GetInstance()->output_configurator()-> 22 ash::Shell::GetInstance()->output_configurator()->
23 ScreenPowerSet(power_on, all_displays); 23 ScreenPowerSet(power_on, all_displays);
24 } 24 }
25 25
26 } // namespace chromeos 26 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698