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

Side by Side Diff: ui/views/mus/screen_mus.h

Issue 2463753003: Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window (Closed)
Patch Set: Created 4 years, 1 month 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/views/mus/screen_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_VIEWS_MUS_SCREEN_MUS_H_ 5 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_
6 #define UI_VIEWS_MUS_SCREEN_MUS_H_ 6 #define UI_VIEWS_MUS_SCREEN_MUS_H_
7 7
8 #include "mojo/public/cpp/bindings/binding.h" 8 #include "mojo/public/cpp/bindings/binding.h"
9 #include "services/ui/public/interfaces/display_manager.mojom.h" 9 #include "services/ui/public/interfaces/display_manager.mojom.h"
10 #include "ui/display/screen_base.h" 10 #include "ui/display/screen_base.h"
(...skipping 15 matching lines...) Expand all
26 // |delegate| can be nullptr. 26 // |delegate| can be nullptr.
27 explicit ScreenMus(ScreenMusDelegate* delegate); 27 explicit ScreenMus(ScreenMusDelegate* delegate);
28 ~ScreenMus() override; 28 ~ScreenMus() override;
29 29
30 void Init(service_manager::Connector* connector); 30 void Init(service_manager::Connector* connector);
31 31
32 private: 32 private:
33 // display::Screen: 33 // display::Screen:
34 gfx::Point GetCursorScreenPoint() override; 34 gfx::Point GetCursorScreenPoint() override;
35 bool IsWindowUnderCursor(gfx::NativeWindow window) override; 35 bool IsWindowUnderCursor(gfx::NativeWindow window) override;
36 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; 36 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
37 37
38 // ui::mojom::DisplayManager: 38 // ui::mojom::DisplayManager:
39 void OnDisplays(mojo::Array<ui::mojom::WsDisplayPtr> ws_displays, 39 void OnDisplays(mojo::Array<ui::mojom::WsDisplayPtr> ws_displays,
40 int64_t primary_display_id, 40 int64_t primary_display_id,
41 int64_t internal_display_id) override; 41 int64_t internal_display_id) override;
42 void OnDisplaysChanged( 42 void OnDisplaysChanged(
43 mojo::Array<ui::mojom::WsDisplayPtr> ws_displays) override; 43 mojo::Array<ui::mojom::WsDisplayPtr> ws_displays) override;
44 void OnDisplayRemoved(int64_t display_id) override; 44 void OnDisplayRemoved(int64_t display_id) override;
45 void OnPrimaryDisplayChanged(int64_t primary_display_id) override; 45 void OnPrimaryDisplayChanged(int64_t primary_display_id) override;
46 46
47 ScreenMusDelegate* delegate_; // Can be nullptr. 47 ScreenMusDelegate* delegate_; // Can be nullptr.
48 ui::mojom::DisplayManagerPtr display_manager_; 48 ui::mojom::DisplayManagerPtr display_manager_;
49 mojo::Binding<ui::mojom::DisplayManagerObserver> 49 mojo::Binding<ui::mojom::DisplayManagerObserver>
50 display_manager_observer_binding_; 50 display_manager_observer_binding_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(ScreenMus); 52 DISALLOW_COPY_AND_ASSIGN(ScreenMus);
53 }; 53 };
54 54
55 } // namespace views 55 } // namespace views
56 56
57 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_ 57 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/mus/screen_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698