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

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

Issue 10961021: Return primary display if out of bounds point or NULL ponter is passed to gfx::Screen::GeDisplayNea (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a few other tests that were using native coordinate. it shoud use screen coordinate now. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/display/multi_display_manager.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 ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_ 5 #ifndef ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
6 #define ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_ 6 #define ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 bool IsActiveDisplay(const gfx::Display& display) const; 57 bool IsActiveDisplay(const gfx::Display& display) const;
58 58
59 // True if there is an internal display. 59 // True if there is an internal display.
60 bool HasInternalDisplay() const; 60 bool HasInternalDisplay() const;
61 61
62 bool IsInternalDisplayId(int64 id) const; 62 bool IsInternalDisplayId(int64 id) const;
63 63
64 bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window, 64 bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
65 const gfx::Insets& insets); 65 const gfx::Insets& insets);
66 66
67 // Returns display for given |id|;
68 const gfx::Display& GetDisplayForId(int64 id) const;
69
67 // Finds the display that contains |point| in screeen coordinates. 70 // Finds the display that contains |point| in screeen coordinates.
68 // Returns invalid display if there is no display that can satisfy 71 // Returns invalid display if there is no display that can satisfy
69 // the condition. 72 // the condition.
70 const gfx::Display& FindDisplayContainingPoint( 73 const gfx::Display& FindDisplayContainingPoint(
71 const gfx::Point& point_in_screen) const; 74 const gfx::Point& point_in_screen) const;
72 75
73 // DisplayManager overrides: 76 // DisplayManager overrides:
74 virtual void OnNativeDisplaysChanged( 77 virtual void OnNativeDisplaysChanged(
75 const std::vector<gfx::Display>& displays) OVERRIDE; 78 const std::vector<gfx::Display>& displays) OVERRIDE;
76 virtual aura::RootWindow* CreateRootWindowForDisplay( 79 virtual aura::RootWindow* CreateRootWindowForDisplay(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 135
133 DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager); 136 DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);
134 }; 137 };
135 138
136 extern const aura::WindowProperty<int64>* const kDisplayIdKey; 139 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
137 140
138 } // namespace internal 141 } // namespace internal
139 } // namespace ash 142 } // namespace ash
140 143
141 #endif // ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_ 144 #endif // ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/display/multi_display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698