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

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

Issue 10534053: ash/chromeos: "Search" key to toggle app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for nit in #2 Created 8 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/ui/views/ash/chrome_shell_delegate.cc ('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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 { "keyboardOverlaySelectPreviousInputMethod", 171 { "keyboardOverlaySelectPreviousInputMethod",
172 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD }, 172 IDS_KEYBOARD_OVERLAY_SELECT_PREVIOUS_INPUT_METHOD },
173 { "keyboardOverlaySelectWordAtATime", 173 { "keyboardOverlaySelectWordAtATime",
174 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME }, 174 IDS_KEYBOARD_OVERLAY_SELECT_WORD_AT_A_TIME },
175 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU }, 175 { "keyboardOverlayShowWrenchMenu", IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU },
176 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT }, 176 { "keyboardOverlaySignOut", IDS_KEYBOARD_OVERLAY_SIGN_OUT },
177 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT }, 177 { "keyboardOverlayTakeScreenshot", IDS_KEYBOARD_OVERLAY_TAKE_SCREENSHOT },
178 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER }, 178 { "keyboardOverlayTaskManager", IDS_KEYBOARD_OVERLAY_TASK_MANAGER },
179 { "keyboardOverlayToggleAccessibilityFeatures", 179 { "keyboardOverlayToggleAccessibilityFeatures",
180 IDS_KEYBOARD_OVERLAY_TOGGLE_ACCESSIBILITY_FEATURES }, 180 IDS_KEYBOARD_OVERLAY_TOGGLE_ACCESSIBILITY_FEATURES },
181 { "keyboardOverlayToggleAppList", IDS_KEYBOARD_OVERLAY_TOGGLE_APP_LIST },
182 { "keyboardOverlayToggleBookmarkBar", 181 { "keyboardOverlayToggleBookmarkBar",
183 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR }, 182 IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR },
184 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK }, 183 { "keyboardOverlayToggleCapsLock", IDS_KEYBOARD_OVERLAY_TOGGLE_CAPS_LOCK },
185 { "keyboardOverlayToggleSpeechInput", 184 { "keyboardOverlayToggleSpeechInput",
186 IDS_KEYBOARD_OVERLAY_TOGGLE_SPEECH_INPUT }, 185 IDS_KEYBOARD_OVERLAY_TOGGLE_SPEECH_INPUT },
187 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO }, 186 { "keyboardOverlayUndo", IDS_KEYBOARD_OVERLAY_UNDO },
188 { "keyboardOverlayViewKeyboardOverlay", 187 { "keyboardOverlayViewKeyboardOverlay",
189 IDS_KEYBOARD_OVERLAY_VIEW_KEYBOARD_OVERLAY }, 188 IDS_KEYBOARD_OVERLAY_VIEW_KEYBOARD_OVERLAY },
190 { "keyboardOverlayViewSource", IDS_KEYBOARD_OVERLAY_VIEW_SOURCE }, 189 { "keyboardOverlayViewSource", IDS_KEYBOARD_OVERLAY_VIEW_SOURCE },
191 { "keyboardOverlayWordMove", IDS_KEYBOARD_OVERLAY_WORD_MOVE }, 190 { "keyboardOverlayWordMove", IDS_KEYBOARD_OVERLAY_WORD_MOVE },
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 321 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
323 : WebDialogUI(web_ui) { 322 : WebDialogUI(web_ui) {
324 Profile* profile = Profile::FromWebUI(web_ui); 323 Profile* profile = Profile::FromWebUI(web_ui);
325 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 324 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
326 web_ui->AddMessageHandler(handler); 325 web_ui->AddMessageHandler(handler);
327 326
328 // Set up the chrome://keyboardoverlay/ source. 327 // Set up the chrome://keyboardoverlay/ source.
329 ChromeURLDataManager::AddDataSource(profile, 328 ChromeURLDataManager::AddDataSource(profile,
330 CreateKeyboardOverlayUIHTMLSource()); 329 CreateKeyboardOverlayUIHTMLSource());
331 } 330 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698