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

Side by Side Diff: extensions/shell/browser/shell_screen.h

Issue 1935083003: gfx::Screen: Replace GetWindowUnderCursor() with IsWindowUnderCursor(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Null checks Created 4 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/aura/window_observer.h" 9 #include "ui/aura/window_observer.h"
10 #include "ui/display/display.h" 10 #include "ui/display/display.h"
(...skipping 21 matching lines...) Expand all
32 aura::WindowTreeHost* CreateHostForPrimaryDisplay(); 32 aura::WindowTreeHost* CreateHostForPrimaryDisplay();
33 33
34 // WindowObserver overrides: 34 // WindowObserver overrides:
35 void OnWindowBoundsChanged(aura::Window* window, 35 void OnWindowBoundsChanged(aura::Window* window,
36 const gfx::Rect& old_bounds, 36 const gfx::Rect& old_bounds,
37 const gfx::Rect& new_bounds) override; 37 const gfx::Rect& new_bounds) override;
38 void OnWindowDestroying(aura::Window* window) override; 38 void OnWindowDestroying(aura::Window* window) override;
39 39
40 // display::Screen overrides: 40 // display::Screen overrides:
41 gfx::Point GetCursorScreenPoint() override; 41 gfx::Point GetCursorScreenPoint() override;
42 gfx::NativeWindow GetWindowUnderCursor() override; 42 bool IsWindowUnderCursor(gfx::NativeWindow window) override;
43 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; 43 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
44 int GetNumDisplays() const override; 44 int GetNumDisplays() const override;
45 std::vector<display::Display> GetAllDisplays() const override; 45 std::vector<display::Display> GetAllDisplays() const override;
46 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override; 46 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
47 display::Display GetDisplayNearestPoint( 47 display::Display GetDisplayNearestPoint(
48 const gfx::Point& point) const override; 48 const gfx::Point& point) const override;
49 display::Display GetDisplayMatching( 49 display::Display GetDisplayMatching(
50 const gfx::Rect& match_rect) const override; 50 const gfx::Rect& match_rect) const override;
51 display::Display GetPrimaryDisplay() const override; 51 display::Display GetPrimaryDisplay() const override;
52 void AddObserver(display::DisplayObserver* observer) override; 52 void AddObserver(display::DisplayObserver* observer) override;
53 void RemoveObserver(display::DisplayObserver* observer) override; 53 void RemoveObserver(display::DisplayObserver* observer) override;
54 54
55 private: 55 private:
56 aura::WindowTreeHost* host_; // Not owned. 56 aura::WindowTreeHost* host_; // Not owned.
57 display::Display display_; 57 display::Display display_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(ShellScreen); 59 DISALLOW_COPY_AND_ASSIGN(ShellScreen);
60 }; 60 };
61 61
62 } // namespace extensions 62 } // namespace extensions
63 63
64 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ 64 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698