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

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

Issue 10332293: Make KeyboardOverlayUI use WebContentsDelegate instead of BrowserList::GetLastActive(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | 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"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 12 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
13 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 13 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 16 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
19 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 17 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
20 #include "chrome/common/jstemplate_builder.h" 18 #include "chrome/common/jstemplate_builder.h"
21 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
22 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
23 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/page_navigator.h"
24 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_contents_delegate.h"
25 #include "content/public/browser/web_ui.h" 25 #include "content/public/browser/web_ui.h"
26 #include "content/public/browser/web_ui_message_handler.h" 26 #include "content/public/browser/web_ui_message_handler.h"
27 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 using chromeos::input_method::ModifierKey; 32 using chromeos::input_method::ModifierKey;
33 using content::WebUIMessageHandler; 33 using content::WebUIMessageHandler;
34 34
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 DictionaryValue dict; 297 DictionaryValue dict;
298 for (ModifierMap::const_iterator i = modifier_map.begin(); 298 for (ModifierMap::const_iterator i = modifier_map.begin();
299 i != modifier_map.end(); ++i) { 299 i != modifier_map.end(); ++i) {
300 dict.SetString(ModifierKeyToLabel(i->first), ModifierKeyToLabel(i->second)); 300 dict.SetString(ModifierKeyToLabel(i->first), ModifierKeyToLabel(i->second));
301 } 301 }
302 302
303 web_ui()->CallJavascriptFunction("initIdentifierMap", dict); 303 web_ui()->CallJavascriptFunction("initIdentifierMap", dict);
304 } 304 }
305 305
306 void KeyboardOverlayHandler::OpenLearnMorePage(const ListValue* args) { 306 void KeyboardOverlayHandler::OpenLearnMorePage(const ListValue* args) {
307 Browser* browser = BrowserList::GetLastActive(); 307 web_ui()->GetWebContents()->GetDelegate()->OpenURLFromTab(
308 DCHECK(browser); 308 web_ui()->GetWebContents(),
309 browser->AddSelectedTabWithURL(GURL(kLearnMoreURL), 309 content::OpenURLParams(GURL(kLearnMoreURL),
310 content::PAGE_TRANSITION_LINK); 310 content::Referrer(),
311 NEW_FOREGROUND_TAB,
312 content::PAGE_TRANSITION_LINK,
313 false));
311 } 314 }
312 315
313 //////////////////////////////////////////////////////////////////////////////// 316 ////////////////////////////////////////////////////////////////////////////////
314 // 317 //
315 // KeyboardOverlayUI 318 // KeyboardOverlayUI
316 // 319 //
317 //////////////////////////////////////////////////////////////////////////////// 320 ////////////////////////////////////////////////////////////////////////////////
318 321
319 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) 322 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
320 : WebDialogUI(web_ui) { 323 : WebDialogUI(web_ui) {
321 Profile* profile = Profile::FromWebUI(web_ui); 324 Profile* profile = Profile::FromWebUI(web_ui);
322 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); 325 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
323 web_ui->AddMessageHandler(handler); 326 web_ui->AddMessageHandler(handler);
324 327
325 // Set up the chrome://keyboardoverlay/ source. 328 // Set up the chrome://keyboardoverlay/ source.
326 ChromeURLDataManager::AddDataSource(profile, 329 ChromeURLDataManager::AddDataSource(profile,
327 CreateKeyboardOverlayUIHTMLSource()); 330 CreateKeyboardOverlayUIHTMLSource());
328 } 331 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698