summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/power
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:21:47 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:21:47 +0000
commit2e236a564aa06711455408a2b13ac8f52ac79343 (patch)
tree04478bff847bfd8b6d90437bf79f41a5caf0b398 /chrome/browser/chromeos/power
parent56827e84ada3c06d8533e01d2fa739f0cb432fa8 (diff)
downloadchromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.zip
chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.gz
chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.bz2
Relanding r144499:
Rename the remaining usage of Monitor to Display BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144499 Review URL: https://chromiumcodereview.appspot.com/10675011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/power')
-rw-r--r--chrome/browser/chromeos/power/output_observer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/power/output_observer.cc b/chrome/browser/chromeos/power/output_observer.cc
index 1896495..9b8c221 100644
--- a/chrome/browser/chromeos/power/output_observer.cc
+++ b/chrome/browser/chromeos/power/output_observer.cc
@@ -6,7 +6,7 @@
#include "ash/shell.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/monitor/output_configurator.h"
+#include "chromeos/display/output_configurator.h"
namespace chromeos {