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

Unified Diff: ash/wm/ash_native_cursor_manager.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager.cc
diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
index 9983620a3fd0cd9fc6370305c90e9e6ef838c62c..3ab68949ae54694ca3cf05bd71fc85bbc27998b2 100644
--- a/ash/wm/ash_native_cursor_manager.cc
+++ b/ash/wm/ash_native_cursor_manager.cc
@@ -16,7 +16,7 @@
#include "ui/base/layout.h"
namespace ash {
-namespace {
+namespace {
void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
aura::Window::Windows root_windows =
@@ -58,19 +58,14 @@ void NotifyMouseEventsEnableStateChange(bool enabled) {
} // namespace
AshNativeCursorManager::AshNativeCursorManager()
- : native_cursor_enabled_(true),
- image_cursors_(new ui::ImageCursors) {
-}
-
-AshNativeCursorManager::~AshNativeCursorManager() {
-}
+ : native_cursor_enabled_(true), image_cursors_(new ui::ImageCursors) {}
+AshNativeCursorManager::~AshNativeCursorManager() {}
void AshNativeCursorManager::SetNativeCursorEnabled(bool enabled) {
native_cursor_enabled_ = enabled;
- ::wm::CursorManager* cursor_manager =
- Shell::GetInstance()->cursor_manager();
+ ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
SetCursor(cursor_manager->GetCursor(), cursor_manager);
}
@@ -80,12 +75,14 @@ void AshNativeCursorManager::SetDisplay(
DCHECK(display.is_valid());
// Use the platform's device scale factor instead of the display's, which
// might have been adjusted for the UI scale.
- const float original_scale = Shell::GetInstance()->display_manager()->
- GetDisplayInfo(display.id()).device_scale_factor();
+ const float original_scale = Shell::GetInstance()
+ ->display_manager()
+ ->GetDisplayInfo(display.id())
+ .device_scale_factor();
#if defined(OS_CHROMEOS)
// And use the nearest resource scale factor.
- const float cursor_scale = ui::GetScaleForScaleFactor(
- ui::GetSupportedScaleFactor(original_scale));
+ const float cursor_scale =
+ ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(original_scale));
#else
// TODO(oshima): crbug.com/143619
const float cursor_scale = original_scale;
« no previous file with comments | « ash/wm/ash_native_cursor_manager.h ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698