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

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

Issue 1257603006: Refactoring for the InputMethod & InputMethodDelegate interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Sadrul's comment. Created 5 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
« no previous file with comments | « no previous file | 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_DISPLAY_CONTROLLER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 void OnHostResized(const aura::WindowTreeHost* host) override; 167 void OnHostResized(const aura::WindowTreeHost* host) override;
168 168
169 // aura::DisplayManager::Delegate overrides: 169 // aura::DisplayManager::Delegate overrides:
170 void CreateOrUpdateMirroringDisplay( 170 void CreateOrUpdateMirroringDisplay(
171 const DisplayInfoList& info_list) override; 171 const DisplayInfoList& info_list) override;
172 void CloseMirroringDisplayIfNotNecessary() override; 172 void CloseMirroringDisplayIfNotNecessary() override;
173 void PreDisplayConfigurationChange(bool clear_focus) override; 173 void PreDisplayConfigurationChange(bool clear_focus) override;
174 void PostDisplayConfigurationChange() override; 174 void PostDisplayConfigurationChange() override;
175 175
176 // ui::internal::InputMethodDelegate overrides: 176 // ui::internal::InputMethodDelegate overrides:
177 bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override; 177 ui::EventDispatchDetails DispatchKeyEventPostIME(
178 ui::KeyEvent* event) override;
178 179
179 InputMethodEventHandler* input_method_event_handler() { 180 InputMethodEventHandler* input_method_event_handler() {
180 return input_method_event_handler_.get(); 181 return input_method_event_handler_.get();
181 } 182 }
182 183
183 private: 184 private:
184 FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, BoundsUpdated); 185 FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, BoundsUpdated);
185 FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, SecondaryDisplayLayout); 186 FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, SecondaryDisplayLayout);
186 friend class DisplayManager; 187 friend class DisplayManager;
187 friend class MirrorWindowController; 188 friend class MirrorWindowController;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 int64 cursor_display_id_for_restore_; 251 int64 cursor_display_id_for_restore_;
251 252
252 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; 253 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
253 254
254 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); 255 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
255 }; 256 };
256 257
257 } // namespace ash 258 } // namespace ash
258 259
259 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 260 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698