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

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

Issue 341643004: Updating keyboard overlay for previous/next user in multi profile mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 { "keyboardOverlayMagnifierIncreaseZoom", 165 { "keyboardOverlayMagnifierIncreaseZoom",
166 IDS_KEYBOARD_OVERLAY_MAGNIFIER_INCREASE_ZOOM }, 166 IDS_KEYBOARD_OVERLAY_MAGNIFIER_INCREASE_ZOOM },
167 { "keyboardOverlayMaximizeWindow", IDS_KEYBOARD_OVERLAY_MAXIMIZE_WINDOW }, 167 { "keyboardOverlayMaximizeWindow", IDS_KEYBOARD_OVERLAY_MAXIMIZE_WINDOW },
168 { "keyboardOverlayMinimizeWindow", IDS_KEYBOARD_OVERLAY_MINIMIZE_WINDOW }, 168 { "keyboardOverlayMinimizeWindow", IDS_KEYBOARD_OVERLAY_MINIMIZE_WINDOW },
169 { "keyboardOverlayMirrorMonitors", IDS_KEYBOARD_OVERLAY_MIRROR_MONITORS }, 169 { "keyboardOverlayMirrorMonitors", IDS_KEYBOARD_OVERLAY_MIRROR_MONITORS },
170 { "keyboardOverlayNewIncognitoWindow", 170 { "keyboardOverlayNewIncognitoWindow",
171 IDS_KEYBOARD_OVERLAY_NEW_INCOGNITO_WINDOW }, 171 IDS_KEYBOARD_OVERLAY_NEW_INCOGNITO_WINDOW },
172 { "keyboardOverlayNewTab", IDS_KEYBOARD_OVERLAY_NEW_TAB }, 172 { "keyboardOverlayNewTab", IDS_KEYBOARD_OVERLAY_NEW_TAB },
173 { "keyboardOverlayNewTerminal", IDS_KEYBOARD_OVERLAY_NEW_TERMINAL }, 173 { "keyboardOverlayNewTerminal", IDS_KEYBOARD_OVERLAY_NEW_TERMINAL },
174 { "keyboardOverlayNewWindow", IDS_KEYBOARD_OVERLAY_NEW_WINDOW }, 174 { "keyboardOverlayNewWindow", IDS_KEYBOARD_OVERLAY_NEW_WINDOW },
175 { "keyboardOverlayNextUser", IDS_KEYBOARD_OVERLAY_NEXT_USER },
175 { "keyboardOverlayNextWindow", IDS_KEYBOARD_OVERLAY_NEXT_WINDOW }, 176 { "keyboardOverlayNextWindow", IDS_KEYBOARD_OVERLAY_NEXT_WINDOW },
176 { "keyboardOverlayNextWord", IDS_KEYBOARD_OVERLAY_NEXT_WORD }, 177 { "keyboardOverlayNextWord", IDS_KEYBOARD_OVERLAY_NEXT_WORD },
177 { "keyboardOverlayOpen", IDS_KEYBOARD_OVERLAY_OPEN }, 178 { "keyboardOverlayOpen", IDS_KEYBOARD_OVERLAY_OPEN },
178 { "keyboardOverlayOpenAddressInNewTab", 179 { "keyboardOverlayOpenAddressInNewTab",
179 IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB }, 180 IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB },
180 { "keyboardOverlayOpenFileManager", IDS_KEYBOARD_OVERLAY_OPEN_FILE_MANAGER }, 181 { "keyboardOverlayOpenFileManager", IDS_KEYBOARD_OVERLAY_OPEN_FILE_MANAGER },
181 { "keyboardOverlayOpenGoogleCloudPrint", 182 { "keyboardOverlayOpenGoogleCloudPrint",
182 IDS_KEYBOARD_OVERLAY_OPEN_GOOGLE_CLOUD_PRINT }, 183 IDS_KEYBOARD_OVERLAY_OPEN_GOOGLE_CLOUD_PRINT },
183 { "keyboardOverlayPageDown", IDS_KEYBOARD_OVERLAY_PAGE_DOWN }, 184 { "keyboardOverlayPageDown", IDS_KEYBOARD_OVERLAY_PAGE_DOWN },
184 { "keyboardOverlayPageUp", IDS_KEYBOARD_OVERLAY_PAGE_UP }, 185 { "keyboardOverlayPageUp", IDS_KEYBOARD_OVERLAY_PAGE_UP },
185 { "keyboardOverlayPaste", IDS_KEYBOARD_OVERLAY_PASTE }, 186 { "keyboardOverlayPaste", IDS_KEYBOARD_OVERLAY_PASTE },
186 { "keyboardOverlayPasteAsPlainText", 187 { "keyboardOverlayPasteAsPlainText",
187 IDS_KEYBOARD_OVERLAY_PASTE_AS_PLAIN_TEXT }, 188 IDS_KEYBOARD_OVERLAY_PASTE_AS_PLAIN_TEXT },
189 { "keyboardOverlayPreviousUser", IDS_KEYBOARD_OVERLAY_PREVIOUS_USER },
188 { "keyboardOverlayPreviousWindow", IDS_KEYBOARD_OVERLAY_PREVIOUS_WINDOW }, 190 { "keyboardOverlayPreviousWindow", IDS_KEYBOARD_OVERLAY_PREVIOUS_WINDOW },
189 { "keyboardOverlayPreviousWord", IDS_KEYBOARD_OVERLAY_PREVIOUS_WORD }, 191 { "keyboardOverlayPreviousWord", IDS_KEYBOARD_OVERLAY_PREVIOUS_WORD },
190 { "keyboardOverlayPrint", IDS_KEYBOARD_OVERLAY_PRINT }, 192 { "keyboardOverlayPrint", IDS_KEYBOARD_OVERLAY_PRINT },
191 { "keyboardOverlayReloadCurrentPage", 193 { "keyboardOverlayReloadCurrentPage",
192 IDS_KEYBOARD_OVERLAY_RELOAD_CURRENT_PAGE }, 194 IDS_KEYBOARD_OVERLAY_RELOAD_CURRENT_PAGE },
193 { "keyboardOverlayReloadIgnoringCache", 195 { "keyboardOverlayReloadIgnoringCache",
194 IDS_KEYBOARD_OVERLAY_RELOAD_IGNORING_CACHE }, 196 IDS_KEYBOARD_OVERLAY_RELOAD_IGNORING_CACHE },
195 { "keyboardOverlayReopenLastClosedTab", 197 { "keyboardOverlayReopenLastClosedTab",
196 IDS_KEYBOARD_OVERLAY_REOPEN_LAST_CLOSED_TAB }, 198 IDS_KEYBOARD_OVERLAY_REOPEN_LAST_CLOSED_TAB },
197 { "keyboardOverlayReportIssue", IDS_KEYBOARD_OVERLAY_REPORT_ISSUE }, 199 { "keyboardOverlayReportIssue", IDS_KEYBOARD_OVERLAY_REPORT_ISSUE },
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 377
376 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 378 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
377 : WebDialogUI(web_ui) { 379 : WebDialogUI(web_ui) {
378 Profile* profile = Profile::FromWebUI(web_ui); 380 Profile* profile = Profile::FromWebUI(web_ui);
379 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 381 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
380 web_ui->AddMessageHandler(handler); 382 web_ui->AddMessageHandler(handler);
381 383
382 // Set up the chrome://keyboardoverlay/ source. 384 // Set up the chrome://keyboardoverlay/ source.
383 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource()); 385 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());
384 } 386 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698