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

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

Issue 1881253002: mus: Implement ScreenMus::GetCursorScreenPoint(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows more. Created 4 years, 8 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 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 #include "ui/views/mus/screen_mus.h" 5 #include "ui/views/mus/screen_mus.h"
6 6
7 #include "mojo/converters/geometry/geometry_type_converters.h" 7 #include "mojo/converters/geometry/geometry_type_converters.h"
8 #include "services/shell/public/cpp/connection.h" 8 #include "services/shell/public/cpp/connection.h"
9 #include "services/shell/public/cpp/connector.h" 9 #include "services/shell/public/cpp/connector.h"
10 #include "ui/gfx/display_finder.h" 10 #include "ui/gfx/display_finder.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 }; 64 };
65 65
66 } // namespace mojo 66 } // namespace mojo
67 67
68 namespace views { 68 namespace views {
69 69
70 ScreenMus::ScreenMus(ScreenMusDelegate* delegate) 70 ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
71 : delegate_(delegate), 71 : delegate_(delegate),
72 primary_display_index_(0), 72 primary_display_index_(0),
73 display_manager_observer_binding_(this) {} 73 display_manager_observer_binding_(this) {
74 }
74 75
75 ScreenMus::~ScreenMus() {} 76 ScreenMus::~ScreenMus() {}
76 77
77 void ScreenMus::Init(shell::Connector* connector) { 78 void ScreenMus::Init(shell::Connector* connector) {
78 gfx::Screen::SetScreenInstance(this); 79 gfx::Screen::SetScreenInstance(this);
79 80
80 connector->ConnectToInterface("mojo:mus", &display_manager_); 81 connector->ConnectToInterface("mojo:mus", &display_manager_);
81 82
82 display_manager_->AddObserver( 83 display_manager_->AddObserver(
83 display_manager_observer_binding_.CreateInterfacePtrAndBind()); 84 display_manager_observer_binding_.CreateInterfacePtrAndBind());
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 changed_display.device_scale_factor()) { 137 changed_display.device_scale_factor()) {
137 local_display->set_device_scale_factor( 138 local_display->set_device_scale_factor(
138 changed_display.device_scale_factor()); 139 changed_display.device_scale_factor());
139 changed_values |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR; 140 changed_values |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
140 } 141 }
141 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, 142 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
142 OnDisplayMetricsChanged(*local_display, changed_values)); 143 OnDisplayMetricsChanged(*local_display, changed_values));
143 } 144 }
144 145
145 gfx::Point ScreenMus::GetCursorScreenPoint() { 146 gfx::Point ScreenMus::GetCursorScreenPoint() {
146 NOTIMPLEMENTED(); 147 return delegate_->GetCursorScreenPoint();
147 return gfx::Point();
148 } 148 }
149 149
150 gfx::NativeWindow ScreenMus::GetWindowUnderCursor() { 150 gfx::NativeWindow ScreenMus::GetWindowUnderCursor() {
151 NOTIMPLEMENTED(); 151 NOTIMPLEMENTED();
152 return nullptr; 152 return nullptr;
153 } 153 }
154 154
155 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { 155 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) {
156 NOTIMPLEMENTED(); 156 NOTIMPLEMENTED();
157 return nullptr; 157 return nullptr;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 DCHECK_NE(-1, index); 228 DCHECK_NE(-1, index);
229 // Another display must become primary before the existing primary is 229 // Another display must become primary before the existing primary is
230 // removed. 230 // removed.
231 DCHECK_NE(index, primary_display_index_); 231 DCHECK_NE(index, primary_display_index_);
232 const gfx::Display display = displays_[index]; 232 const gfx::Display display = displays_[index];
233 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, 233 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
234 OnDisplayRemoved(display)); 234 OnDisplayRemoved(display));
235 } 235 }
236 236
237 } // namespace views 237 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698