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

Unified Diff: ash/sticky_keys/sticky_keys_overlay.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/sticky_keys/sticky_keys_overlay.h ('k') | ash/sticky_keys/sticky_keys_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_overlay.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc
index f5412c0f4b920514fba9684421a1bf10ba65e867..44421e8c8e0c79cf375ddacd87c59e9770a20b2d 100644
--- a/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/ash/sticky_keys/sticky_keys_overlay.cc
@@ -38,7 +38,6 @@ const ui::ResourceBundle::FontStyle kKeyLabelFontStyle =
// Duration of slide animation when overlay is shown or hidden.
const int kSlideAnimationDurationMs = 100;
-
}
///////////////////////////////////////////////////////////////////////////////
@@ -72,8 +71,7 @@ StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
SetSubpixelRenderingEnabled(false);
}
-StickyKeyOverlayLabel::~StickyKeyOverlayLabel() {
-}
+StickyKeyOverlayLabel::~StickyKeyOverlayLabel() {}
void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
state_ = state;
@@ -144,21 +142,16 @@ StickyKeysOverlayView::StickyKeysOverlayView() {
int child_spacing = font_size - 2 * font_padding;
SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
- horizontal_spacing,
- vertical_spacing,
+ horizontal_spacing, vertical_spacing,
child_spacing));
AddKeyLabel(ui::EF_CONTROL_DOWN,
l10n_util::GetStringUTF8(IDS_ASH_CONTROL_KEY));
- AddKeyLabel(ui::EF_ALT_DOWN,
- l10n_util::GetStringUTF8(IDS_ASH_ALT_KEY));
- AddKeyLabel(ui::EF_SHIFT_DOWN,
- l10n_util::GetStringUTF8(IDS_ASH_SHIFT_KEY));
+ AddKeyLabel(ui::EF_ALT_DOWN, l10n_util::GetStringUTF8(IDS_ASH_ALT_KEY));
+ AddKeyLabel(ui::EF_SHIFT_DOWN, l10n_util::GetStringUTF8(IDS_ASH_SHIFT_KEY));
AddKeyLabel(ui::EF_COMMAND_DOWN,
l10n_util::GetStringUTF8(IDS_ASH_SEARCH_KEY));
- AddKeyLabel(ui::EF_ALTGR_DOWN,
- l10n_util::GetStringUTF8(IDS_ASH_ALTGR_KEY));
- AddKeyLabel(ui::EF_MOD3_DOWN,
- l10n_util::GetStringUTF8(IDS_ASH_MOD3_KEY));
+ AddKeyLabel(ui::EF_ALTGR_DOWN, l10n_util::GetStringUTF8(IDS_ASH_ALTGR_KEY));
+ AddKeyLabel(ui::EF_MOD3_DOWN, l10n_util::GetStringUTF8(IDS_ASH_MOD3_KEY));
}
StickyKeysOverlayView::~StickyKeysOverlayView() {}
@@ -287,8 +280,7 @@ void StickyKeysOverlay::SetModifierKeyState(ui::EventFlags modifier,
overlay_view_->SetKeyState(modifier, state);
}
-StickyKeyState StickyKeysOverlay::GetModifierKeyState(
- ui::EventFlags modifier) {
+StickyKeyState StickyKeysOverlay::GetModifierKeyState(ui::EventFlags modifier) {
return overlay_view_->GetKeyState(modifier);
}
@@ -318,7 +310,6 @@ void StickyKeysOverlay::OnLayerAnimationAborted(
}
void StickyKeysOverlay::OnLayerAnimationScheduled(
- ui::LayerAnimationSequence* sequence) {
-}
+ ui::LayerAnimationSequence* sequence) {}
} // namespace ash
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay.h ('k') | ash/sticky_keys/sticky_keys_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698