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

Side by Side Diff: ash/system/chromeos/tray_display.cc

Issue 12391004: chromeos: Add DisplayPowerServiceProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ugh, TrayDisplay was including output_configurator.h on windows Created 7 years, 9 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
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/wm/user_activity_detector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/system/chromeos/tray_display.h" 5 #include "ash/system/chromeos/tray_display.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/screen_ash.h" 9 #include "ash/screen_ash.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 void TrayDisplay::OnDisplayAdded(const gfx::Display& new_display) { 176 void TrayDisplay::OnDisplayAdded(const gfx::Display& new_display) {
177 if (default_) 177 if (default_)
178 default_->Update(); 178 default_->Update();
179 } 179 }
180 180
181 void TrayDisplay::OnDisplayRemoved(const gfx::Display& old_display) { 181 void TrayDisplay::OnDisplayRemoved(const gfx::Display& old_display) {
182 if (default_) 182 if (default_)
183 default_->Update(); 183 default_->Update();
184 } 184 }
185 185
186 #if defined(OS_CHROMEOS)
186 void TrayDisplay::OnDisplayModeChanged() { 187 void TrayDisplay::OnDisplayModeChanged() {
187 if (default_) 188 if (default_)
188 default_->Update(); 189 default_->Update();
189 } 190 }
191 #endif
190 192
191 } // namespace internal 193 } // namespace internal
192 } // namespace ash 194 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/wm/user_activity_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698