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

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

Issue 11185031: Temporarily remove "Swap primary monitor" from keyboard overlay for merging to M23. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION }, 186 IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION },
187 { "keyboardOverlayScrollUpOnePage", 187 { "keyboardOverlayScrollUpOnePage",
188 IDS_KEYBOARD_OVERLAY_SCROLL_UP_ONE_PAGE }, 188 IDS_KEYBOARD_OVERLAY_SCROLL_UP_ONE_PAGE },
189 { "keyboardOverlaySelectAll", IDS_KEYBOARD_OVERLAY_SELECT_ALL }, 189 { "keyboardOverlaySelectAll", IDS_KEYBOARD_OVERLAY_SELECT_ALL },
190 { "keyboardOverlaySelectPreviousInputMethod", 190 { "keyboardOverlaySelectPreviousInputMethod",
191 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD }, 191 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD },
192 { "keyboardOverlaySelectWordAtATime", 192 { "keyboardOverlaySelectWordAtATime",
193 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME }, 193 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME },
194 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU }, 194 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU },
195 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT }, 195 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT },
196 { "keyboardOverlaySwapPrimaryMonitor",
197 IDS_KEYBOARD_OVERLAY_SWAP_PRIMARY_MONITOR },
198 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT }, 196 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT },
199 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER }, 197 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER },
200 { "keyboardOverlayToggleAccessibilityFeatures", 198 { "keyboardOverlayToggleAccessibilityFeatures",
201 IDS_KEYBOARD_OVERLAY_TOGGLE_ACCESSIBILITY_FEATURES }, 199 IDS_KEYBOARD_OVERLAY_TOGGLE_ACCESSIBILITY_FEATURES },
202 { "keyboardOverlayToggleBookmarkBar", 200 { "keyboardOverlayToggleBookmarkBar",
203 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR }, 201 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR },
204 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK }, 202 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK },
205 { "keyboardOverlayToggleSpeechInput", 203 { "keyboardOverlayToggleSpeechInput",
206 IDS_KEYBOARD_OVERLAY_TOGGLE_SPEECH_INPUT }, 204 IDS_KEYBOARD_OVERLAY_TOGGLE_SPEECH_INPUT },
207 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO }, 205 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO },
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 340 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
343 : WebDialogUI(web_ui) { 341 : WebDialogUI(web_ui) {
344 Profile* profile = Profile::FromWebUI(web_ui); 342 Profile* profile = Profile::FromWebUI(web_ui);
345 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 343 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
346 web_ui->AddMessageHandler(handler); 344 web_ui->AddMessageHandler(handler);
347 345
348 // Set up the chrome://keyboardoverlay/ source. 346 // Set up the chrome://keyboardoverlay/ source.
349 ChromeURLDataManager::AddDataSource(profile, 347 ChromeURLDataManager::AddDataSource(profile,
350 CreateKeyboardOverlayUIHTMLSource()); 348 CreateKeyboardOverlayUIHTMLSource());
351 } 349 }
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