summaryrefslogtreecommitdiffstats
path: root/ash/display/event_transformation_handler.cc
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 20:06:11 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 20:06:11 +0000
commit1e31cbd00e25a70b4826f16bac3b044bec7725a7 (patch)
tree615f96d9f5c5c0c7a134c24ee2451213c98f226c /ash/display/event_transformation_handler.cc
parentc32b4c577f0ba82a2d8024af1c8ab9cec80c800f (diff)
downloadchromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.zip
chromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.tar.gz
chromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.tar.bz2
Renamed OutputConfigurator to DisplayConfigurator
BUG=333413 Review URL: https://codereview.chromium.org/226183004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/event_transformation_handler.cc')
-rw-r--r--ash/display/event_transformation_handler.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc
index 2ea462a..4591a7c 100644
--- a/ash/display/event_transformation_handler.cc
+++ b/ash/display/event_transformation_handler.cc
@@ -17,7 +17,7 @@
#include "ui/gfx/screen.h"
#if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -59,18 +59,18 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
// the sqrt of
// (mirror_width * mirror_height) / (native_width * native_height)
void EventTransformationHandler::OnTouchEvent(ui::TouchEvent* event) {
- using ui::OutputConfigurator;
- OutputConfigurator* output_configurator =
- ash::Shell::GetInstance()->output_configurator();
+ using ui::DisplayConfigurator;
+ DisplayConfigurator* display_configurator =
+ ash::Shell::GetInstance()->display_configurator();
- // Check output_configurator's output_state instead of checking
+ // Check display_configurator's output_state instead of checking
// DisplayManager::IsMirrored() because the compositor based mirroring
// won't cause the scaling issue.
- if (output_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
+ if (display_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
return;
const std::map<int, float>& area_ratio_map =
- output_configurator->GetMirroredDisplayAreaRatioMap();
+ display_configurator->GetMirroredDisplayAreaRatioMap();
// TODO(miletus): When there are more than 1 touchscreen (e.g. Link connected
// to an external touchscreen), the correct way to do is to have a way