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

Side by Side Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Issue 550373002: chromeos: Shorten some strings in the keyboard overlay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update metrics owners Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 }; 56 };
57 57
58 struct I18nContentToMessage { 58 struct I18nContentToMessage {
59 const char* i18n_content; 59 const char* i18n_content;
60 int message; 60 int message;
61 } kI18nContentToMessage[] = { 61 } kI18nContentToMessage[] = {
62 { "keyboardOverlayLearnMore", IDS_KEYBOARD_OVERLAY_LEARN_MORE }, 62 { "keyboardOverlayLearnMore", IDS_KEYBOARD_OVERLAY_LEARN_MORE },
63 { "keyboardOverlayTitle", IDS_KEYBOARD_OVERLAY_TITLE }, 63 { "keyboardOverlayTitle", IDS_KEYBOARD_OVERLAY_TITLE },
64 { "keyboardOverlayInstructions", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS }, 64 { "keyboardOverlayInstructions", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS },
65 { "keyboardOverlayInstructionsHide", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE }, 65 { "keyboardOverlayInstructionsHide", IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE },
66 { "keyboardOverlayActivateLastLauncherItem", 66 { "keyboardOverlayActivateLastShelfItem",
67 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_LAUNCHER_ITEM }, 67 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_SHELF_ITEM },
68 { "keyboardOverlayActivateLastTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB }, 68 { "keyboardOverlayActivateLastTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_LAST_TAB },
69 { "keyboardOverlayActivateLauncherItem1", 69 { "keyboardOverlayActivateShelfItem1",
70 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_1 }, 70 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_1 },
71 { "keyboardOverlayActivateLauncherItem2", 71 { "keyboardOverlayActivateShelfItem2",
72 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_2 }, 72 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_2 },
73 { "keyboardOverlayActivateLauncherItem3", 73 { "keyboardOverlayActivateShelfItem3",
74 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_3 }, 74 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_3 },
75 { "keyboardOverlayActivateLauncherItem4", 75 { "keyboardOverlayActivateShelfItem4",
76 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_4 }, 76 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_4 },
77 { "keyboardOverlayActivateLauncherItem5", 77 { "keyboardOverlayActivateShelfItem5",
78 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_5 }, 78 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_5 },
79 { "keyboardOverlayActivateLauncherItem6", 79 { "keyboardOverlayActivateShelfItem6",
80 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_6 }, 80 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_6 },
81 { "keyboardOverlayActivateLauncherItem7", 81 { "keyboardOverlayActivateShelfItem7",
82 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_7 }, 82 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_7 },
83 { "keyboardOverlayActivateLauncherItem8", 83 { "keyboardOverlayActivateShelfItem8",
84 IDS_KEYBOARD_OVERLAY_ACTIVATE_LAUNCHER_ITEM_8 }, 84 IDS_KEYBOARD_OVERLAY_ACTIVATE_SHELF_ITEM_8 },
85 { "keyboardOverlayActivateNextTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_NEXT_TAB }, 85 { "keyboardOverlayActivateNextTab", IDS_KEYBOARD_OVERLAY_ACTIVATE_NEXT_TAB },
86 { "keyboardOverlayActivatePreviousTab", 86 { "keyboardOverlayActivatePreviousTab",
87 IDS_KEYBOARD_OVERLAY_ACTIVATE_PREVIOUS_TAB }, 87 IDS_KEYBOARD_OVERLAY_ACTIVATE_PREVIOUS_TAB },
88 { "keyboardOverlayActivateTab1", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_1 }, 88 { "keyboardOverlayActivateTab1", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_1 },
89 { "keyboardOverlayActivateTab2", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_2 }, 89 { "keyboardOverlayActivateTab2", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_2 },
90 { "keyboardOverlayActivateTab3", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_3 }, 90 { "keyboardOverlayActivateTab3", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_3 },
91 { "keyboardOverlayActivateTab4", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_4 }, 91 { "keyboardOverlayActivateTab4", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_4 },
92 { "keyboardOverlayActivateTab5", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_5 }, 92 { "keyboardOverlayActivateTab5", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_5 },
93 { "keyboardOverlayActivateTab6", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_6 }, 93 { "keyboardOverlayActivateTab6", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_6 },
94 { "keyboardOverlayActivateTab7", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_7 }, 94 { "keyboardOverlayActivateTab7", IDS_KEYBOARD_OVERLAY_ACTIVATE_TAB_7 },
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 { "keyboardOverlayF8", IDS_KEYBOARD_OVERLAY_F8 }, 131 { "keyboardOverlayF8", IDS_KEYBOARD_OVERLAY_F8 },
132 { "keyboardOverlayF9", IDS_KEYBOARD_OVERLAY_F9 }, 132 { "keyboardOverlayF9", IDS_KEYBOARD_OVERLAY_F9 },
133 { "keyboardOverlayFindPreviousText", 133 { "keyboardOverlayFindPreviousText",
134 IDS_KEYBOARD_OVERLAY_FIND_PREVIOUS_TEXT }, 134 IDS_KEYBOARD_OVERLAY_FIND_PREVIOUS_TEXT },
135 { "keyboardOverlayFindText", IDS_KEYBOARD_OVERLAY_FIND_TEXT }, 135 { "keyboardOverlayFindText", IDS_KEYBOARD_OVERLAY_FIND_TEXT },
136 { "keyboardOverlayFindTextAgain", IDS_KEYBOARD_OVERLAY_FIND_TEXT_AGAIN }, 136 { "keyboardOverlayFindTextAgain", IDS_KEYBOARD_OVERLAY_FIND_TEXT_AGAIN },
137 { "keyboardOverlayFocusAddressBar", IDS_KEYBOARD_OVERLAY_FOCUS_ADDRESS_BAR }, 137 { "keyboardOverlayFocusAddressBar", IDS_KEYBOARD_OVERLAY_FOCUS_ADDRESS_BAR },
138 { "keyboardOverlayFocusAddressBarInSearchMode", 138 { "keyboardOverlayFocusAddressBarInSearchMode",
139 IDS_KEYBOARD_OVERLAY_FOCUS_ADDRESS_BAR_IN_SEARCH_MODE }, 139 IDS_KEYBOARD_OVERLAY_FOCUS_ADDRESS_BAR_IN_SEARCH_MODE },
140 { "keyboardOverlayFocusBookmarks", IDS_KEYBOARD_OVERLAY_FOCUS_BOOKMARKS }, 140 { "keyboardOverlayFocusBookmarks", IDS_KEYBOARD_OVERLAY_FOCUS_BOOKMARKS },
141 { "keyboardOverlayFocusLauncher", IDS_KEYBOARD_OVERLAY_FOCUS_LAUNCHER }, 141 { "keyboardOverlayFocusShelf", IDS_KEYBOARD_OVERLAY_FOCUS_SHELF },
142 { "keyboardOverlayFocusNextPane", IDS_KEYBOARD_OVERLAY_FOCUS_NEXT_PANE }, 142 { "keyboardOverlayFocusNextPane", IDS_KEYBOARD_OVERLAY_FOCUS_NEXT_PANE },
143 { "keyboardOverlayFocusPreviousPane", 143 { "keyboardOverlayFocusPreviousPane",
144 IDS_KEYBOARD_OVERLAY_FOCUS_PREVIOUS_PANE }, 144 IDS_KEYBOARD_OVERLAY_FOCUS_PREVIOUS_PANE },
145 { "keyboardOverlayFocusToolbar", IDS_KEYBOARD_OVERLAY_FOCUS_TOOLBAR }, 145 { "keyboardOverlayFocusToolbar", IDS_KEYBOARD_OVERLAY_FOCUS_TOOLBAR },
146 { "keyboardOverlayGoBack", IDS_KEYBOARD_OVERLAY_GO_BACK }, 146 { "keyboardOverlayGoBack", IDS_KEYBOARD_OVERLAY_GO_BACK },
147 { "keyboardOverlayGoForward", IDS_KEYBOARD_OVERLAY_GO_FORWARD }, 147 { "keyboardOverlayGoForward", IDS_KEYBOARD_OVERLAY_GO_FORWARD },
148 { "keyboardOverlayHelp", IDS_KEYBOARD_OVERLAY_HELP }, 148 { "keyboardOverlayHelp", IDS_KEYBOARD_OVERLAY_HELP },
149 { "keyboardOverlayHistory", IDS_KEYBOARD_OVERLAY_HISTORY }, 149 { "keyboardOverlayHistory", IDS_KEYBOARD_OVERLAY_HISTORY },
150 { "keyboardOverlayHome", IDS_KEYBOARD_OVERLAY_HOME }, 150 { "keyboardOverlayHome", IDS_KEYBOARD_OVERLAY_HOME },
151 { "keyboardOverlayIncreaseKeyBrightness", 151 { "keyboardOverlayIncreaseKeyBrightness",
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 375
376 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 376 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
377 : WebDialogUI(web_ui) { 377 : WebDialogUI(web_ui) {
378 Profile* profile = Profile::FromWebUI(web_ui); 378 Profile* profile = Profile::FromWebUI(web_ui);
379 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 379 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
380 web_ui->AddMessageHandler(handler); 380 web_ui->AddMessageHandler(handler);
381 381
382 // Set up the chrome://keyboardoverlay/ source. 382 // Set up the chrome://keyboardoverlay/ source.
383 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource()); 383 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());
384 } 384 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698