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

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

Issue 10270002: Get the custom frame limping with win-aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « no previous file | ui/views/views.gyp » ('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 #if defined(USE_ASH)
27 // TODO(oshima): Implement ScreenImpl for Linux/aura and remove this 26 // TODO(oshima): Implement ScreenImpl for Linux/aura and remove this
28 // ifdef. 27 // ifdef.
29 28
30 // static 29 // static
31 Point Screen::GetCursorScreenPoint() { 30 Point Screen::GetCursorScreenPoint() {
32 return g_instance_->GetCursorScreenPoint(); 31 return g_instance_->GetCursorScreenPoint();
33 } 32 }
34 33
35 // static 34 // static
36 NativeWindow Screen::GetWindowAtCursorScreenPoint() { 35 NativeWindow Screen::GetWindowAtCursorScreenPoint() {
(...skipping 18 matching lines...) Expand all
55 // static 54 // static
56 Monitor Screen::GetPrimaryMonitor() { 55 Monitor Screen::GetPrimaryMonitor() {
57 return g_instance_->GetPrimaryMonitor(); 56 return g_instance_->GetPrimaryMonitor();
58 } 57 }
59 58
60 // static 59 // static
61 Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) { 60 Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
62 return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint()); 61 return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint());
63 } 62 }
64 63
65 #endif
66
67 } // namespace gfx 64 } // namespace gfx
OLDNEW
« no previous file with comments | « no previous file | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698