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

Side by Side Diff: ui/platform_window/win/win_window.cc

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ash_unittests, sadrul's comments Created 5 years, 2 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 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 "ui/platform_window/win/win_window.h" 5 #include "ui/platform_window/win/win_window.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "ui/base/cursor/cursor_loader_win.h"
9 #include "ui/events/event.h" 10 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 11 #include "ui/events/event_utils.h"
11 #include "ui/gfx/win/msg_util.h" 12 #include "ui/gfx/win/msg_util.h"
12 #include "ui/platform_window/platform_window_delegate.h" 13 #include "ui/platform_window/platform_window_delegate.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 namespace { 17 namespace {
17 18
18 bool use_popup_as_root_window_for_test = false; 19 bool use_popup_as_root_window_for_test = false;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 101 }
101 102
102 void WinWindow::ToggleFullscreen() {} 103 void WinWindow::ToggleFullscreen() {}
103 104
104 void WinWindow::Maximize() {} 105 void WinWindow::Maximize() {}
105 106
106 void WinWindow::Minimize() {} 107 void WinWindow::Minimize() {}
107 108
108 void WinWindow::Restore() {} 109 void WinWindow::Restore() {}
109 110
110 void WinWindow::SetCursor(PlatformCursor cursor) {} 111 void WinWindow::SetCursor(PlatformCursor cursor) {
112 // Custom web cursors are handled directly.
113 if (cursor == ui::kCursorCustom)
114 return;
115
116 ui::CursorLoaderWin cursor_loader;
117 cursor_loader.SetPlatformCursor(&cursor);
118 ::SetCursor(cursor.platform());
119 }
111 120
112 void WinWindow::MoveCursorTo(const gfx::Point& location) {} 121 void WinWindow::MoveCursorTo(const gfx::Point& location) {}
113 122
114 void WinWindow::ConfineCursorToBounds(const gfx::Rect& bounds) { 123 void WinWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
115 } 124 }
116 125
117 PlatformImeController* WinWindow::GetPlatformImeController() { 126 PlatformImeController* WinWindow::GetPlatformImeController() {
118 return nullptr; 127 return nullptr;
119 } 128 }
120 129
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 196
188 namespace test { 197 namespace test {
189 198
190 // static 199 // static
191 void SetUsePopupAsRootWindowForTest(bool use) { 200 void SetUsePopupAsRootWindowForTest(bool use) {
192 use_popup_as_root_window_for_test = use; 201 use_popup_as_root_window_for_test = use;
193 } 202 }
194 203
195 } // namespace test 204 } // namespace test
196 } // namespace ui 205 } // namespace ui
OLDNEW
« ui/aura/window_tree_host_platform.cc ('K') | « ui/aura/window_tree_host_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698