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

Side by Side Diff: ash/touch/touch_observer_hud.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
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('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/touch/touch_observer_hud.h" 5 #include "ash/touch/touch_observer_hud.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/root_window_settings.h" 9 #include "ash/root_window_settings.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void TouchObserverHUD::OnDisplayMetricsChanged(const display::Display& display, 95 void TouchObserverHUD::OnDisplayMetricsChanged(const display::Display& display,
96 uint32_t metrics) { 96 uint32_t metrics) {
97 if (display.id() != display_id_ || !(metrics & DISPLAY_METRIC_BOUNDS)) 97 if (display.id() != display_id_ || !(metrics & DISPLAY_METRIC_BOUNDS))
98 return; 98 return;
99 99
100 widget_->SetSize(display.size()); 100 widget_->SetSize(display.size());
101 } 101 }
102 102
103 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
104 void TouchObserverHUD::OnDisplayModeChanged( 104 void TouchObserverHUD::OnDisplayModeChanged(
105 const ui::DisplayConfigurator::DisplayStateList& outputs) { 105 const display::DisplayConfigurator::DisplayStateList& outputs) {
106 // Clear touch HUD for any change in display mode (single, dual extended, dual 106 // Clear touch HUD for any change in display mode (single, dual extended, dual
107 // mirrored, ...). 107 // mirrored, ...).
108 Clear(); 108 Clear();
109 } 109 }
110 #endif // defined(OS_CHROMEOS) 110 #endif // defined(OS_CHROMEOS)
111 111
112 void TouchObserverHUD::OnDisplaysInitialized() { 112 void TouchObserverHUD::OnDisplaysInitialized() {
113 OnDisplayConfigurationChanged(); 113 OnDisplayConfigurationChanged();
114 } 114 }
115 115
(...skipping 26 matching lines...) Expand all
142 widget_->GetNativeView(), 142 widget_->GetNativeView(),
143 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer)); 143 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
144 144
145 RootWindowController* controller = GetRootWindowController(root_window_); 145 RootWindowController* controller = GetRootWindowController(root_window_);
146 SetHudForRootWindowController(controller); 146 SetHudForRootWindowController(controller);
147 147
148 root_window_->AddPreTargetHandler(this); 148 root_window_->AddPreTargetHandler(this);
149 } 149 }
150 150
151 } // namespace ash 151 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698