diff options
author | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 20:44:56 +0000 |
---|---|---|
committer | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 20:44:56 +0000 |
commit | 2e4eb24149af7fa531318baec569c5755f4b431b (patch) | |
tree | 7f0b9fb4d729f2c70ace004cd91915b5d21c3f6a /ui | |
parent | dd6c2314ddcefd2b214cf63729ca66308ed85ea5 (diff) | |
download | chromium_src-2e4eb24149af7fa531318baec569c5755f4b431b.zip chromium_src-2e4eb24149af7fa531318baec569c5755f4b431b.tar.gz chromium_src-2e4eb24149af7fa531318baec569c5755f4b431b.tar.bz2 |
Rename desktop_cursor_loader_updater_aurax11.
This CL renames DesktopCursorLoaderUpdaterAuraX11 as
DesktopCursorLoaderUpdaterAuraLinux. This would make it possible for
using it on Linux platform with Ozone besides X11.
BUG=
Review URL: https://codereview.chromium.org/47073002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/views/views.gyp | 4 | ||||
-rw-r--r-- | ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc (renamed from ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.cc) | 14 | ||||
-rw-r--r-- | ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h (renamed from ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h) | 14 |
3 files changed, 16 insertions, 16 deletions
diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 3b8de34..90bd77d 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -366,9 +366,9 @@ 'widget/desktop_aura/desktop_capture_client.cc', 'widget/desktop_aura/desktop_capture_client.h', 'widget/desktop_aura/desktop_cursor_loader_updater.h', + 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc', + 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h', 'widget/desktop_aura/desktop_cursor_loader_updater_aurawin.cc', - 'widget/desktop_aura/desktop_cursor_loader_updater_aurax11.cc', - 'widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h', 'widget/desktop_aura/desktop_dispatcher_client.cc', 'widget/desktop_aura/desktop_dispatcher_client.h', 'widget/desktop_aura/desktop_drag_drop_client_aurax11.cc', diff --git a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.cc b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc index 16b5ca1..80d99d1 100644 --- a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h" +#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor_loader.h" @@ -48,17 +48,17 @@ void LoadImageCursors(float device_scale_factor, ui::CursorLoader* loader) { } // namespace -DesktopCursorLoaderUpdaterAuraX11::DesktopCursorLoaderUpdaterAuraX11() {} +DesktopCursorLoaderUpdaterAuraLinux::DesktopCursorLoaderUpdaterAuraLinux() {} -DesktopCursorLoaderUpdaterAuraX11::~DesktopCursorLoaderUpdaterAuraX11() {} +DesktopCursorLoaderUpdaterAuraLinux::~DesktopCursorLoaderUpdaterAuraLinux() {} -void DesktopCursorLoaderUpdaterAuraX11::OnCreate( +void DesktopCursorLoaderUpdaterAuraLinux::OnCreate( aura::RootWindow* window, ui::CursorLoader* loader) { LoadImageCursors(window->compositor()->device_scale_factor(), loader); } -void DesktopCursorLoaderUpdaterAuraX11::OnDisplayUpdated( +void DesktopCursorLoaderUpdaterAuraLinux::OnDisplayUpdated( const gfx::Display& display, ui::CursorLoader* loader) { LoadImageCursors(display.device_scale_factor(), loader); @@ -67,7 +67,7 @@ void DesktopCursorLoaderUpdaterAuraX11::OnDisplayUpdated( // static scoped_ptr<DesktopCursorLoaderUpdater> DesktopCursorLoaderUpdater::Create() { return scoped_ptr<DesktopCursorLoaderUpdater>( - new DesktopCursorLoaderUpdaterAuraX11).Pass(); + new DesktopCursorLoaderUpdaterAuraLinux).Pass(); } } // namespace views diff --git a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h index 3018c97..02db2b2 100644 --- a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h +++ b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_LOADER_UPDATER_AURAX11_H_ -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_LOADER_UPDATER_AURAX11_H_ +#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_LOADER_UPDATER_AURALINUX_H_ +#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_LOADER_UPDATER_AURALINUX_H_ #include "base/compiler_specific.h" #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" @@ -11,10 +11,10 @@ namespace views { // Loads the subset of aura cursors that X11 doesn't provide. -class DesktopCursorLoaderUpdaterAuraX11 : public DesktopCursorLoaderUpdater { +class DesktopCursorLoaderUpdaterAuraLinux : public DesktopCursorLoaderUpdater { public: - DesktopCursorLoaderUpdaterAuraX11(); - virtual ~DesktopCursorLoaderUpdaterAuraX11(); + DesktopCursorLoaderUpdaterAuraLinux(); + virtual ~DesktopCursorLoaderUpdaterAuraLinux(); // Overridden from DesktopCursorLoaderUpdater: virtual void OnCreate(aura::RootWindow* window, @@ -25,4 +25,4 @@ class DesktopCursorLoaderUpdaterAuraX11 : public DesktopCursorLoaderUpdater { } // namespace views -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DISPLAY_CHANGE_HANDLER_AURAX11_H_ +#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DISPLAY_CHANGE_HANDLER_AURALINUX_H_ |