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

Side by Side Diff: ash/touch/touch_observer_hud.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 unified diff | Download patch | Annotate | Revision Log
« 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/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/root_window_settings.h" 8 #include "ash/root_window_settings.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {} 97 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {}
98 98
99 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) { 99 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) {
100 if (old_display.id() != display_id_) 100 if (old_display.id() != display_id_)
101 return; 101 return;
102 widget_->CloseNow(); 102 widget_->CloseNow();
103 } 103 }
104 104
105 #if defined(OS_CHROMEOS) 105 #if defined(OS_CHROMEOS)
106 void TouchObserverHUD::OnDisplayModeChanged( 106 void TouchObserverHUD::OnDisplayModeChanged(
107 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) { 107 const std::vector<ui::OutputConfigurator::OutputSnapshot>& outputs) {
108 // Clear touch HUD for any change in display mode (single, dual extended, dual 108 // Clear touch HUD for any change in display mode (single, dual extended, dual
109 // mirrored, ...). 109 // mirrored, ...).
110 Clear(); 110 Clear();
111 } 111 }
112 #endif // defined(OS_CHROMEOS) 112 #endif // defined(OS_CHROMEOS)
113 113
114 void TouchObserverHUD::OnDisplayConfigurationChanging() { 114 void TouchObserverHUD::OnDisplayConfigurationChanging() {
115 if (!root_window_) 115 if (!root_window_)
116 return; 116 return;
117 117
(...skipping 23 matching lines...) Expand all
141 internal::kShellWindowId_OverlayContainer)); 141 internal::kShellWindowId_OverlayContainer));
142 142
143 RootWindowController* controller = GetRootWindowController(root_window_); 143 RootWindowController* controller = GetRootWindowController(root_window_);
144 SetHudForRootWindowController(controller); 144 SetHudForRootWindowController(controller);
145 145
146 root_window_->AddPreTargetHandler(this); 146 root_window_->AddPreTargetHandler(this);
147 } 147 }
148 148
149 } // namespace internal 149 } // namespace internal
150 } // namespace ash 150 } // 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