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

Side by Side Diff: chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/dbus/chrome_display_power_service_provider_del egate.h" 5 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
6 6
7 #include "ash/common/wm/screen_dimmer.h" 7 #include "ash/common/wm/screen_dimmer.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "ui/base/user_activity/user_activity_detector.h" 10 #include "ui/base/user_activity/user_activity_detector.h"
(...skipping 12 matching lines...) Expand all
23 void ChromeDisplayPowerServiceProviderDelegate::SetDisplayPower( 23 void ChromeDisplayPowerServiceProviderDelegate::SetDisplayPower(
24 DisplayPowerState power_state, 24 DisplayPowerState power_state,
25 const ResponseCallback& callback) { 25 const ResponseCallback& callback) {
26 // Turning displays off when the device becomes idle or on just before 26 // Turning displays off when the device becomes idle or on just before
27 // we suspend may trigger a mouse move, which would then be incorrectly 27 // we suspend may trigger a mouse move, which would then be incorrectly
28 // reported as user activity. Let the UserActivityDetector 28 // reported as user activity. Let the UserActivityDetector
29 // know so that it can ignore such events. 29 // know so that it can ignore such events.
30 ui::UserActivityDetector::Get()->OnDisplayPowerChanging(); 30 ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
31 31
32 ash::Shell::GetInstance()->display_configurator()->SetDisplayPower( 32 ash::Shell::GetInstance()->display_configurator()->SetDisplayPower(
33 power_state, ui::DisplayConfigurator::kSetDisplayPowerNoFlags, callback); 33 power_state, display::DisplayConfigurator::kSetDisplayPowerNoFlags,
34 callback);
34 } 35 }
35 36
36 void ChromeDisplayPowerServiceProviderDelegate::SetDimming(bool dimmed) { 37 void ChromeDisplayPowerServiceProviderDelegate::SetDimming(bool dimmed) {
37 if (!screen_dimmer_) { 38 if (!screen_dimmer_) {
38 screen_dimmer_ = 39 screen_dimmer_ =
39 base::MakeUnique<ash::ScreenDimmer>(ash::ScreenDimmer::Container::ROOT); 40 base::MakeUnique<ash::ScreenDimmer>(ash::ScreenDimmer::Container::ROOT);
40 } 41 }
41 screen_dimmer_->SetDimming(dimmed); 42 screen_dimmer_->SetDimming(dimmed);
42 } 43 }
43 44
44 } // namespace chromeos 45 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | chrome/browser/chromeos/display/display_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698