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

Side by Side Diff: ui/gfx/screen_aura.cc

Issue 10389109: Add gfx::Screen::IsEnabled() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Decided that the original approach with gfx::Sceren::IsDIPEnabled is better than the ifdef Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/screen_android.cc ('k') | ui/gfx/screen_gtk.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 #include "ui/gfx/screen.h" 5 #include "ui/gfx/screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/gfx/monitor.h" 8 #include "ui/gfx/monitor.h"
9 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
10 #include "ui/gfx/screen_impl.h" 10 #include "ui/gfx/screen_impl.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 // gfx can't depend upon aura, otherwise we have circular dependencies. So, 14 // gfx can't depend upon aura, otherwise we have circular dependencies. So,
15 // gfx::Screen is pluggable and Desktop plugs in the real implementation. 15 // gfx::Screen is pluggable and Desktop plugs in the real implementation.
16 namespace { 16 namespace {
17 ScreenImpl* g_instance_ = NULL; 17 ScreenImpl* g_instance_ = NULL;
18 } 18 }
19 19
20 // static 20 // static
21 void Screen::SetInstance(ScreenImpl* screen) { 21 void Screen::SetInstance(ScreenImpl* screen) {
22 delete g_instance_; 22 delete g_instance_;
23 g_instance_ = screen; 23 g_instance_ = screen;
24 } 24 }
25 25
26 // TODO(oshima): Implement ScreenImpl for Linux/aura and remove this 26 // TODO(oshima): Implement ScreenImpl for Linux/aura and remove this
27 // ifdef. 27 // ifdef.
28 28
29 // static 29 // static
30 bool Screen::IsDIPEnabled() {
31 return true;
32 }
33
34 // static
30 Point Screen::GetCursorScreenPoint() { 35 Point Screen::GetCursorScreenPoint() {
31 return g_instance_->GetCursorScreenPoint(); 36 return g_instance_->GetCursorScreenPoint();
32 } 37 }
33 38
34 // static 39 // static
35 NativeWindow Screen::GetWindowAtCursorScreenPoint() { 40 NativeWindow Screen::GetWindowAtCursorScreenPoint() {
36 return g_instance_->GetWindowAtCursorScreenPoint(); 41 return g_instance_->GetWindowAtCursorScreenPoint();
37 } 42 }
38 43
39 // static 44 // static
(...skipping 15 matching lines...) Expand all
55 Monitor Screen::GetPrimaryMonitor() { 60 Monitor Screen::GetPrimaryMonitor() {
56 return g_instance_->GetPrimaryMonitor(); 61 return g_instance_->GetPrimaryMonitor();
57 } 62 }
58 63
59 // static 64 // static
60 Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) { 65 Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
61 return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint()); 66 return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint());
62 } 67 }
63 68
64 } // namespace gfx 69 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/screen_android.cc ('k') | ui/gfx/screen_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698