projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ash
/
sticky_keys
/
sticky_keys_overlay.cc
diff --git
a/src/ash/sticky_keys/sticky_keys_overlay.cc
b/src/ash/sticky_keys/sticky_keys_overlay.cc
index
5b239f7
..
0766ba2
100644
(file)
--- a/
src/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/
src/ash/sticky_keys/sticky_keys_overlay.cc
@@
-47,7
+47,7
@@
class StickyKeyOverlayLabel : public views::Label {
public:
explicit StickyKeyOverlayLabel(const std::string& key_name);
public:
explicit StickyKeyOverlayLabel(const std::string& key_name);
-
virtual ~StickyKeyOverlayLabel()
;
+
~StickyKeyOverlayLabel() override
;
StickyKeyState state() const { return state_; }
StickyKeyState state() const { return state_; }
@@
-105,10
+105,10
@@
class StickyKeysOverlayView : public views::WidgetDelegateView {
public:
StickyKeysOverlayView();
public:
StickyKeysOverlayView();
-
virtual ~StickyKeysOverlayView()
;
+
~StickyKeysOverlayView() override
;
// views::WidgetDelegateView overrides:
// views::WidgetDelegateView overrides:
- v
irtual void OnPaint(gfx::Canvas* canvas) OVERRIDE
;
+ v
oid OnPaint(gfx::Canvas* canvas) override
;
void SetKeyState(ui::EventFlags modifier, StickyKeyState state);
void SetKeyState(ui::EventFlags modifier, StickyKeyState state);
@@
-148,6
+148,8
@@
StickyKeysOverlayView::StickyKeysOverlayView() {
l10n_util::GetStringUTF8(IDS_ASH_ALT_KEY));
AddKeyLabel(ui::EF_SHIFT_DOWN,
l10n_util::GetStringUTF8(IDS_ASH_SHIFT_KEY));
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,
AddKeyLabel(ui::EF_ALTGR_DOWN,
l10n_util::GetStringUTF8(IDS_ASH_ALTGR_KEY));
AddKeyLabel(ui::EF_MOD3_DOWN,