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

Side by Side Diff: ash/display/window_tree_host_manager.h

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/display/shutdown_observer_chromeos.cc ('k') | ash/display/window_tree_host_manager.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 #ifndef ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_ 5 #ifndef ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
6 #define ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_ 6 #define ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 // aura::WindowTreeHostObserver overrides: 151 // aura::WindowTreeHostObserver overrides:
152 void OnHostResized(const aura::WindowTreeHost* host) override; 152 void OnHostResized(const aura::WindowTreeHost* host) override;
153 153
154 // display::DisplayManager::Delegate overrides: 154 // display::DisplayManager::Delegate overrides:
155 void CreateOrUpdateMirroringDisplay( 155 void CreateOrUpdateMirroringDisplay(
156 const display::DisplayInfoList& info_list) override; 156 const display::DisplayInfoList& info_list) override;
157 void CloseMirroringDisplayIfNotNecessary() override; 157 void CloseMirroringDisplayIfNotNecessary() override;
158 void PreDisplayConfigurationChange(bool clear_focus) override; 158 void PreDisplayConfigurationChange(bool clear_focus) override;
159 void PostDisplayConfigurationChange(bool must_clear_window) override; 159 void PostDisplayConfigurationChange(bool must_clear_window) override;
160 ui::DisplayConfigurator* display_configurator() override; 160 display::DisplayConfigurator* display_configurator() override;
161 161
162 // ui::internal::InputMethodDelegate overrides: 162 // ui::internal::InputMethodDelegate overrides:
163 ui::EventDispatchDetails DispatchKeyEventPostIME( 163 ui::EventDispatchDetails DispatchKeyEventPostIME(
164 ui::KeyEvent* event) override; 164 ui::KeyEvent* event) override;
165 165
166 InputMethodEventHandler* input_method_event_handler() { 166 InputMethodEventHandler* input_method_event_handler() {
167 return input_method_event_handler_.get(); 167 return input_method_event_handler_.get();
168 } 168 }
169 169
170 private: 170 private:
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 int64_t cursor_display_id_for_restore_; 212 int64_t cursor_display_id_for_restore_;
213 213
214 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; 214 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
215 215
216 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); 216 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
217 }; 217 };
218 218
219 } // namespace ash 219 } // namespace ash
220 220
221 #endif // ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_ 221 #endif // ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/display/shutdown_observer_chromeos.cc ('k') | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698