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

Side by Side Diff: ash/touch/touch_observer_hud.cc

Issue 22871010: chromeos: Include mode details in OutputSnapshot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 4 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') | chromeos/display/output_configurator.h » ('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/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/property_util.h" 10 #include "ash/wm/property_util.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {} 98 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {}
99 99
100 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) { 100 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) {
101 if (old_display.id() != display_id_) 101 if (old_display.id() != display_id_)
102 return; 102 return;
103 widget_->CloseNow(); 103 widget_->CloseNow();
104 } 104 }
105 105
106 #if defined(OS_CHROMEOS) 106 #if defined(OS_CHROMEOS)
107 void TouchObserverHUD::OnDisplayModeChanged() { 107 void TouchObserverHUD::OnDisplayModeChanged(
108 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) {
108 // Clear touch HUD for any change in display mode (single, dual extended, dual 109 // Clear touch HUD for any change in display mode (single, dual extended, dual
109 // mirrored, ...). 110 // mirrored, ...).
110 Clear(); 111 Clear();
111 } 112 }
112 #endif // defined(OS_CHROMEOS) 113 #endif // defined(OS_CHROMEOS)
113 114
114 void TouchObserverHUD::OnDisplayConfigurationChanging() { 115 void TouchObserverHUD::OnDisplayConfigurationChanging() {
115 if (!root_window_) 116 if (!root_window_)
116 return; 117 return;
117 118
(...skipping 23 matching lines...) Expand all
141 internal::kShellWindowId_OverlayContainer)); 142 internal::kShellWindowId_OverlayContainer));
142 143
143 RootWindowController* controller = GetRootWindowController(root_window_); 144 RootWindowController* controller = GetRootWindowController(root_window_);
144 SetHudForRootWindowController(controller); 145 SetHudForRootWindowController(controller);
145 146
146 root_window_->AddPreTargetHandler(this); 147 root_window_->AddPreTargetHandler(this);
147 } 148 }
148 149
149 } // namespace internal 150 } // namespace internal
150 } // namespace ash 151 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698