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

Unified Diff: ash/test/ui_controls_factory_ash.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/test/test_volume_control_delegate.cc ('k') | ash/test/user_metrics_recorder_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index 3ab880f3949b60dd6140957c50010c346e68f0fc..8573427f593eff29abc068b5fe0c6be49ae45e7c 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -32,8 +32,7 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(UIControlsAura, kUIControlsKey, NULL);
// kUIControlsKey is owned property and UIControls object
// will be deleted when the root window is deleted.
UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
- UIControlsAura* native_ui_control =
- root_window->GetProperty(kUIControlsKey);
+ UIControlsAura* native_ui_control = root_window->GetProperty(kUIControlsKey);
if (!native_ui_control) {
native_ui_control =
aura::test::CreateUIControlsAura(root_window->GetHost());
@@ -54,8 +53,7 @@ UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
class UIControlsAsh : public UIControlsAura {
public:
- UIControlsAsh() {
- }
+ UIControlsAsh() {}
~UIControlsAsh() override {}
// UIControslAura overrides:
@@ -65,8 +63,8 @@ class UIControlsAsh : public UIControlsAura {
bool shift,
bool alt,
bool command) override {
- return SendKeyPressNotifyWhenDone(
- window, key, control, shift, alt, command, base::Closure());
+ return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command,
+ base::Closure());
}
bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
@@ -79,8 +77,9 @@ class UIControlsAsh : public UIControlsAura {
aura::Window* root =
window ? window->GetRootWindow() : ash::Shell::GetTargetRootWindow();
UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
- return ui_controls && ui_controls->SendKeyPressNotifyWhenDone(
- window, key, control, shift, alt, command, closure);
+ return ui_controls &&
+ ui_controls->SendKeyPressNotifyWhenDone(window, key, control, shift,
+ alt, command, closure);
}
bool SendMouseMove(long x, long y) override {
@@ -95,7 +94,7 @@ class UIControlsAsh : public UIControlsAura {
gfx::Point p(x, y);
UIControlsAura* ui_controls = GetUIControlsAt(p);
return ui_controls &&
- ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
+ ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
}
bool SendMouseEvents(MouseButton type, int state) override {
@@ -109,8 +108,8 @@ class UIControlsAsh : public UIControlsAura {
const base::Closure& closure) override {
gfx::Point p(aura::Env::GetInstance()->last_mouse_location());
UIControlsAura* ui_controls = GetUIControlsAt(p);
- return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
- type, state, closure);
+ return ui_controls &&
+ ui_controls->SendMouseEventsNotifyWhenDone(type, state, closure);
}
bool SendMouseClick(MouseButton type) override {
@@ -121,8 +120,8 @@ class UIControlsAsh : public UIControlsAura {
void RunClosureAfterAllPendingUIEvents(
const base::Closure& closure) override {
- UIControlsAura* ui_controls = GetUIControlsForRootWindow(
- ash::Shell::GetTargetRootWindow());
+ UIControlsAura* ui_controls =
+ GetUIControlsForRootWindow(ash::Shell::GetTargetRootWindow());
if (ui_controls)
ui_controls->RunClosureAfterAllPendingUIEvents(closure);
}
« no previous file with comments | « ash/test/test_volume_control_delegate.cc ('k') | ash/test/user_metrics_recorder_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698