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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc

Issue 111043002: Cursor state should be global for desktop Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't copy set of root windows before iterating Created 7 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h " 5 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h "
6 6
7 #include "ui/aura/root_window.h" 7 #include "ui/aura/root_window.h"
8 #include "ui/base/cursor/cursor_loader.h" 8 #include "ui/base/cursor/cursor_loader.h"
9 #include "ui/base/cursor/cursors_aura.h" 9 #include "ui/base/cursor/cursors_aura.h"
10 #include "ui/gfx/display.h" 10 #include "ui/gfx/display.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 } 46 }
47 } 47 }
48 48
49 } // namespace 49 } // namespace
50 50
51 DesktopCursorLoaderUpdaterAuraLinux::DesktopCursorLoaderUpdaterAuraLinux() {} 51 DesktopCursorLoaderUpdaterAuraLinux::DesktopCursorLoaderUpdaterAuraLinux() {}
52 52
53 DesktopCursorLoaderUpdaterAuraLinux::~DesktopCursorLoaderUpdaterAuraLinux() {} 53 DesktopCursorLoaderUpdaterAuraLinux::~DesktopCursorLoaderUpdaterAuraLinux() {}
54 54
55 void DesktopCursorLoaderUpdaterAuraLinux::OnCreate( 55 void DesktopCursorLoaderUpdaterAuraLinux::OnCreate(
56 aura::RootWindow* window, 56 float device_scale_factor,
57 ui::CursorLoader* loader) { 57 ui::CursorLoader* loader) {
58 LoadImageCursors(window->compositor()->device_scale_factor(), loader); 58 LoadImageCursors(device_scale_factor, loader);
59 } 59 }
60 60
61 void DesktopCursorLoaderUpdaterAuraLinux::OnDisplayUpdated( 61 void DesktopCursorLoaderUpdaterAuraLinux::OnDisplayUpdated(
62 const gfx::Display& display, 62 const gfx::Display& display,
63 ui::CursorLoader* loader) { 63 ui::CursorLoader* loader) {
64 LoadImageCursors(display.device_scale_factor(), loader); 64 LoadImageCursors(display.device_scale_factor(), loader);
65 } 65 }
66 66
67 // static 67 // static
68 scoped_ptr<DesktopCursorLoaderUpdater> DesktopCursorLoaderUpdater::Create() { 68 scoped_ptr<DesktopCursorLoaderUpdater> DesktopCursorLoaderUpdater::Create() {
69 return scoped_ptr<DesktopCursorLoaderUpdater>( 69 return scoped_ptr<DesktopCursorLoaderUpdater>(
70 new DesktopCursorLoaderUpdaterAuraLinux).Pass(); 70 new DesktopCursorLoaderUpdaterAuraLinux).Pass();
71 } 71 }
72 72
73 } // namespace views 73 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698