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

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

Issue 2523873002: Remove DisplayChangeObserver ash dependencies. (Closed)
Patch Set: Remove comment. 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
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // display::DisplayManager::Delegate overrides: 160 // display::DisplayManager::Delegate overrides:
161 void CreateOrUpdateMirroringDisplay( 161 void CreateOrUpdateMirroringDisplay(
162 const display::DisplayInfoList& info_list) override; 162 const display::DisplayInfoList& info_list) override;
163 void CloseMirroringDisplayIfNotNecessary() override; 163 void CloseMirroringDisplayIfNotNecessary() override;
164 void PreDisplayConfigurationChange(bool clear_focus) override; 164 void PreDisplayConfigurationChange(bool clear_focus) override;
165 void PostDisplayConfigurationChange(bool must_clear_window) override; 165 void PostDisplayConfigurationChange(bool must_clear_window) override;
166 #if defined(OS_CHROMEOS) 166 #if defined(OS_CHROMEOS)
167 ui::DisplayConfigurator* display_configurator() override; 167 ui::DisplayConfigurator* display_configurator() override;
168 #endif 168 #endif
169 std::string GetInternalDisplayNameString() override;
170 std::string GetUnknownDisplayNameString() override;
171 169
172 // ui::internal::InputMethodDelegate overrides: 170 // ui::internal::InputMethodDelegate overrides:
173 ui::EventDispatchDetails DispatchKeyEventPostIME( 171 ui::EventDispatchDetails DispatchKeyEventPostIME(
174 ui::KeyEvent* event) override; 172 ui::KeyEvent* event) override;
175 173
176 InputMethodEventHandler* input_method_event_handler() { 174 InputMethodEventHandler* input_method_event_handler() {
177 return input_method_event_handler_.get(); 175 return input_method_event_handler_.get();
178 } 176 }
179 177
180 private: 178 private:
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 // should be moved after a display configuration change. 220 // should be moved after a display configuration change.
223 int64_t cursor_display_id_for_restore_; 221 int64_t cursor_display_id_for_restore_;
224 222
225 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; 223 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
226 224
227 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); 225 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
228 }; 226 };
229 227
230 } // namespace ash 228 } // namespace ash
231 229
232 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 230 #endif // ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698