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

Side by Side Diff: ui/aura/window_tree_host.h

Issue 2345283002: aura: Allow platform to choose how it retrieves ICCProfile. (Closed)
Patch Set: Created 4 years, 3 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 | ui/aura/window_tree_host.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 UI_AURA_WINDOW_TREE_HOST_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
6 #define UI_AURA_WINDOW_TREE_HOST_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/event_types.h" 10 #include "base/event_types.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "ui/aura/aura_export.h" 13 #include "ui/aura/aura_export.h"
14 #include "ui/base/cursor/cursor.h" 14 #include "ui/base/cursor/cursor.h"
15 #include "ui/base/ime/input_method_delegate.h" 15 #include "ui/base/ime/input_method_delegate.h"
16 #include "ui/events/event_source.h" 16 #include "ui/events/event_source.h"
17 #include "ui/gfx/geometry/insets.h" 17 #include "ui/gfx/geometry/insets.h"
18 #include "ui/gfx/native_widget_types.h" 18 #include "ui/gfx/native_widget_types.h"
19 19
20 namespace gfx { 20 namespace gfx {
21 class ICCProfile;
21 class Insets; 22 class Insets;
22 class Point; 23 class Point;
23 class Rect; 24 class Rect;
24 class Size; 25 class Size;
25 class Transform; 26 class Transform;
26 } 27 }
27 28
28 namespace ui { 29 namespace ui {
29 class Compositor; 30 class Compositor;
30 class EventProcessor; 31 class EventProcessor;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 214
214 // Hides the WindowTreeHost. 215 // Hides the WindowTreeHost.
215 virtual void HideImpl() = 0; 216 virtual void HideImpl() = 0;
216 217
217 // Overridden from ui::EventSource: 218 // Overridden from ui::EventSource:
218 ui::EventProcessor* GetEventProcessor() override; 219 ui::EventProcessor* GetEventProcessor() override;
219 220
220 private: 221 private:
221 friend class test::WindowTreeHostTestApi; 222 friend class test::WindowTreeHostTestApi;
222 223
224 virtual gfx::ICCProfile GetICCProfileForCurrentDisplay();
sky 2016/09/16 17:30:08 Shouldn't this be protected?
sadrul 2016/09/16 17:52:17 The subclasses do not have to call this function [
225
223 // Moves the cursor to the specified location. This method is internally used 226 // Moves the cursor to the specified location. This method is internally used
224 // by MoveCursorTo() and MoveCursorToHostLocation(). 227 // by MoveCursorTo() and MoveCursorToHostLocation().
225 void MoveCursorToInternal(const gfx::Point& root_location, 228 void MoveCursorToInternal(const gfx::Point& root_location,
226 const gfx::Point& host_location); 229 const gfx::Point& host_location);
227 230
228 // We don't use a std::unique_ptr for |window_| since we need this ptr to be 231 // We don't use a std::unique_ptr for |window_| since we need this ptr to be
229 // valid during its deletion. (Window's dtor notifies observers that may 232 // valid during its deletion. (Window's dtor notifies observers that may
230 // attempt to reach back up to access this object which will be valid until 233 // attempt to reach back up to access this object which will be valid until
231 // the end of the dtor). 234 // the end of the dtor).
232 Window* window_; // Owning. 235 Window* window_; // Owning.
(...skipping 19 matching lines...) Expand all
252 bool owned_input_method_; 255 bool owned_input_method_;
253 256
254 gfx::Insets output_surface_padding_; 257 gfx::Insets output_surface_padding_;
255 258
256 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); 259 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
257 }; 260 };
258 261
259 } // namespace aura 262 } // namespace aura
260 263
261 #endif // UI_AURA_WINDOW_TREE_HOST_H_ 264 #endif // UI_AURA_WINDOW_TREE_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698