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

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

Issue 2523873002: Remove DisplayChangeObserver ash dependencies. (Closed)
Patch Set: Change DCO constructor slightly. Created 4 years 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_DISPLAY_CONTROLLER_H_ 5 #ifndef ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_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>
11 #include <memory> 11 #include <memory>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ash/ash_export.h" 14 #include "ash/ash_export.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 #if defined(OS_CHROMEOS) 160 #if defined(OS_CHROMEOS)
161 ui::DisplayConfigurator* display_configurator() override; 161 ui::DisplayConfigurator* display_configurator() override;
162 #endif 162 #endif
163 std::string GetInternalDisplayNameString() override;
164 std::string GetUnknownDisplayNameString() override;
165 163
166 // ui::internal::InputMethodDelegate overrides: 164 // ui::internal::InputMethodDelegate overrides:
167 ui::EventDispatchDetails DispatchKeyEventPostIME( 165 ui::EventDispatchDetails DispatchKeyEventPostIME(
168 ui::KeyEvent* event) override; 166 ui::KeyEvent* event) override;
169 167
170 InputMethodEventHandler* input_method_event_handler() { 168 InputMethodEventHandler* input_method_event_handler() {
171 return input_method_event_handler_.get(); 169 return input_method_event_handler_.get();
172 } 170 }
173 171
174 private: 172 private:
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // should be moved after a display configuration change. 214 // should be moved after a display configuration change.
217 int64_t cursor_display_id_for_restore_; 215 int64_t cursor_display_id_for_restore_;
218 216
219 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; 217 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
220 218
221 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); 219 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
222 }; 220 };
223 221
224 } // namespace ash 222 } // namespace ash
225 223
226 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 224 #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