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

Unified Diff: chrome/browser/chromeos/dbus/display_power_service_provider.cc

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include display.gyp into ChromeOS builds only Created 6 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dbus/display_power_service_provider.cc
diff --git a/chrome/browser/chromeos/dbus/display_power_service_provider.cc b/chrome/browser/chromeos/dbus/display_power_service_provider.cc
index 6f629f2d75a97f833f84984b360a24b6e745a140..6192952b7bbb7b2f9973daa0191da855009900df 100644
--- a/chrome/browser/chromeos/dbus/display_power_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/display_power_service_provider.cc
@@ -7,10 +7,10 @@
#include "ash/shell.h"
#include "ash/wm/user_activity_detector.h"
#include "base/bind.h"
-#include "chromeos/display/output_configurator.h"
#include "dbus/bus.h"
#include "dbus/message.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/display/chromeos/output_configurator.h"
namespace chromeos {
@@ -62,7 +62,7 @@ void DisplayPowerServiceProvider::SetDisplayPower(
DisplayPowerState state = static_cast<DisplayPowerState>(int_state);
ash::Shell::GetInstance()->output_configurator()->SetDisplayPower(
- state, OutputConfigurator::kSetDisplayPowerNoFlags);
+ state, ui::OutputConfigurator::kSetDisplayPowerNoFlags);
} else {
LOG(ERROR) << "Unable to parse " << kSetDisplayPower << " request";
}
« 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