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

Side by Side Diff: components/mus/ws/display_manager.cc

Issue 1618963005: Revert of Start of display management for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « components/mus/ws/display_manager.h ('k') | components/mus/ws/window_tree_host_impl.h » ('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 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 #include "components/mus/ws/display_manager.h" 5 #include "components/mus/ws/display_manager.h"
6 6
7 #include "base/numerics/safe_conversions.h" 7 #include "base/numerics/safe_conversions.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/output/delegated_frame_data.h" 10 #include "cc/output/delegated_frame_data.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 ui::Cursor cursor(cursor_id); 247 ui::Cursor cursor(cursor_id);
248 cursor_loader_->SetPlatformCursor(&cursor); 248 cursor_loader_->SetPlatformCursor(&cursor);
249 platform_window_->SetCursor(cursor.platform()); 249 platform_window_->SetCursor(cursor.platform());
250 #endif 250 #endif
251 } 251 }
252 252
253 const mojom::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() { 253 const mojom::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
254 return metrics_; 254 return metrics_;
255 } 255 }
256 256
257 mojom::Rotation DefaultDisplayManager::GetRotation() {
258 // TODO(sky): implement me.
259 return mojom::Rotation::VALUE_0;
260 }
261
262 void DefaultDisplayManager::UpdateTextInputState( 257 void DefaultDisplayManager::UpdateTextInputState(
263 const ui::TextInputState& state) { 258 const ui::TextInputState& state) {
264 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); 259 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController();
265 if (ime) 260 if (ime)
266 ime->UpdateTextInputState(state); 261 ime->UpdateTextInputState(state);
267 } 262 }
268 263
269 void DefaultDisplayManager::SetImeVisibility(bool visible) { 264 void DefaultDisplayManager::SetImeVisibility(bool visible) {
270 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); 265 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController();
271 if (ime) 266 if (ime)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 415
421 void DefaultDisplayManager::OnAcceleratedWidgetDestroyed() { 416 void DefaultDisplayManager::OnAcceleratedWidgetDestroyed() {
422 NOTREACHED(); 417 NOTREACHED();
423 } 418 }
424 419
425 void DefaultDisplayManager::OnActivationChanged(bool active) {} 420 void DefaultDisplayManager::OnActivationChanged(bool active) {}
426 421
427 } // namespace ws 422 } // namespace ws
428 423
429 } // namespace mus 424 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/display_manager.h ('k') | components/mus/ws/window_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698