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

Side by Side Diff: ui/aura/mus/in_flight_change.h

Issue 2784663003: mus: Rename mojom::Cursor to mojom::CursorType. (Closed)
Patch Set: Created 3 years, 8 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 | « services/ui/ws/window_tree_unittest.cc ('k') | ui/aura/mus/in_flight_change.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MUS_IN_FLIGHT_CHANGE_H_ 5 #ifndef UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/optional.h" 16 #include "base/optional.h"
17 #include "cc/surfaces/local_surface_id.h" 17 #include "cc/surfaces/local_surface_id.h"
18 #include "ui/aura/window_observer.h" 18 #include "ui/aura/window_observer.h"
19 #include "ui/base/ui_base_types.h" 19 #include "ui/base/ui_base_types.h"
20 #include "ui/gfx/geometry/rect.h" 20 #include "ui/gfx/geometry/rect.h"
21 21
22 namespace ui { 22 namespace ui {
23 23
24 namespace mojom { 24 namespace mojom {
25 enum class Cursor : int32_t; 25 enum class CursorType : int32_t;
26 } 26 }
27 27
28 } // namespace ui 28 } // namespace ui
29 29
30 namespace aura { 30 namespace aura {
31 31
32 class CaptureSynchronizer; 32 class CaptureSynchronizer;
33 class FocusSynchronizer; 33 class FocusSynchronizer;
34 class WindowMus; 34 class WindowMus;
35 class WindowTreeClient; 35 class WindowTreeClient;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 private: 267 private:
268 const std::string property_name_; 268 const std::string property_name_;
269 std::unique_ptr<std::vector<uint8_t>> revert_value_; 269 std::unique_ptr<std::vector<uint8_t>> revert_value_;
270 270
271 DISALLOW_COPY_AND_ASSIGN(InFlightPropertyChange); 271 DISALLOW_COPY_AND_ASSIGN(InFlightPropertyChange);
272 }; 272 };
273 273
274 class InFlightPredefinedCursorChange : public InFlightChange { 274 class InFlightPredefinedCursorChange : public InFlightChange {
275 public: 275 public:
276 InFlightPredefinedCursorChange(WindowMus* window, 276 InFlightPredefinedCursorChange(WindowMus* window,
277 ui::mojom::Cursor revert_value); 277 ui::mojom::CursorType revert_value);
278 ~InFlightPredefinedCursorChange() override; 278 ~InFlightPredefinedCursorChange() override;
279 279
280 // InFlightChange: 280 // InFlightChange:
281 void SetRevertValueFrom(const InFlightChange& change) override; 281 void SetRevertValueFrom(const InFlightChange& change) override;
282 void Revert() override; 282 void Revert() override;
283 283
284 private: 284 private:
285 ui::mojom::Cursor revert_cursor_; 285 ui::mojom::CursorType revert_cursor_;
286 286
287 DISALLOW_COPY_AND_ASSIGN(InFlightPredefinedCursorChange); 287 DISALLOW_COPY_AND_ASSIGN(InFlightPredefinedCursorChange);
288 }; 288 };
289 289
290 class InFlightVisibleChange : public InFlightChange { 290 class InFlightVisibleChange : public InFlightChange {
291 public: 291 public:
292 InFlightVisibleChange(WindowTreeClient* client, 292 InFlightVisibleChange(WindowTreeClient* client,
293 WindowMus* window, 293 WindowMus* window,
294 const bool revert_value); 294 const bool revert_value);
295 ~InFlightVisibleChange() override; 295 ~InFlightVisibleChange() override;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 331
332 private: 332 private:
333 ui::ModalType revert_modal_type_; 333 ui::ModalType revert_modal_type_;
334 334
335 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange); 335 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange);
336 }; 336 };
337 337
338 } // namespace aura 338 } // namespace aura
339 339
340 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 340 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
OLDNEW
« no previous file with comments | « services/ui/ws/window_tree_unittest.cc ('k') | ui/aura/mus/in_flight_change.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698