diff options
| author | ginkage <ginkage@chromium.org> | 2015-04-22 10:39:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 17:40:37 +0000 |
| commit | 4e868bdfdfd93d4518ce20bca8d9ec0869d00d2a (patch) | |
| tree | 9daca1b60a3799b698d7fcdadf27549bf2b07b6c /ash | |
| parent | 53d42c09f2051e1d294b114e28d63620ce06a429 (diff) | |
| download | chromium_src-4e868bdfdfd93d4518ce20bca8d9ec0869d00d2a.zip chromium_src-4e868bdfdfd93d4518ce20bca8d9ec0869d00d2a.tar.gz chromium_src-4e868bdfdfd93d4518ce20bca8d9ec0869d00d2a.tar.bz2 | |
Add keyboard shortcut kill switch to the new GAIA flow.
The new key combo is Ctrl+Alt+Shift+L, and it only works at the network
screen. Also, it now displays a notification whether the new flow is
enabled or not.
BUG=462824
Review URL: https://codereview.chromium.org/1105523002
Cr-Commit-Position: refs/heads/master@{#326330}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_chromeos_strings.grdp | 6 | ||||
| -rw-r--r-- | ash/system/system_notifier.cc | 2 | ||||
| -rw-r--r-- | ash/system/system_notifier.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ash/ash_chromeos_strings.grdp b/ash/ash_chromeos_strings.grdp index e4b80e0..ab48212 100644 --- a/ash/ash_chromeos_strings.grdp +++ b/ash/ash_chromeos_strings.grdp @@ -412,4 +412,10 @@ Press Shift + Alt to switch. <message name="IDS_ASH_LOGOUT_CONFIRMATION_BUTTON" desc="The text for okay button of the logout confirmation dialog."> Sign out now </message> + <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_ENABLED" desc="The text shown in the tray menu when the WebView-based sign-in is enabled."> + New login UI is ON + </message> + <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_DISABLED" desc="The text shown in the tray menu when the WebView-based sign-in is disabled."> + New login UI is OFF + </message> </grit-part> diff --git a/ash/system/system_notifier.cc b/ash/system/system_notifier.cc index 6ff6dcb..c762930 100644 --- a/ash/system/system_notifier.cc +++ b/ash/system/system_notifier.cc @@ -27,6 +27,7 @@ const char* kAlwaysShownSystemNotifierIds[] = { kNotifierDisplayError, #if defined(OS_CHROMEOS) ui::NetworkStateNotifier::kNotifierNetworkError, + kNotifierOobeScreen, #endif kNotifierPower, // Note: Order doesn't matter here, so keep this in alphabetic order, don't @@ -76,6 +77,7 @@ const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; const char kNotifierLocale[] = "ash.locale"; const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector"; +const char kNotifierOobeScreen[] = "ash.oobe-screen"; const char kNotifierPower[] = "ash.power"; const char kNotifierScreenshot[] = "ash.screenshot"; const char kNotifierScreenCapture[] = "ash.screen-capture"; diff --git a/ash/system/system_notifier.h b/ash/system/system_notifier.h index 9461389..540f328 100644 --- a/ash/system/system_notifier.h +++ b/ash/system/system_notifier.h @@ -24,6 +24,7 @@ ASH_EXPORT extern const char kNotifierMultiProfileFirstRun[]; ASH_EXPORT extern const char kNotifierNetwork[]; ASH_EXPORT extern const char kNotifierNetworkError[]; ASH_EXPORT extern const char kNotifierNetworkPortalDetector[]; +ASH_EXPORT extern const char kNotifierOobeScreen[]; ASH_EXPORT extern const char kNotifierPower[]; ASH_EXPORT extern const char kNotifierScreenshot[]; ASH_EXPORT extern const char kNotifierScreenCapture[]; |