OLD | NEW |
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_list.h" | 16 #include "chrome/browser/ui/browser_list.h" |
17 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" | 17 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |
18 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" | 18 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" |
19 #include "chrome/common/jstemplate_builder.h" | 19 #include "chrome/common/jstemplate_builder.h" |
20 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
21 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
22 #include "content/browser/webui/web_ui.h" | |
23 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
24 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
| 24 #include "content/public/browser/web_ui.h" |
25 #include "content/public/browser/web_ui_message_handler.h" | 25 #include "content/public/browser/web_ui_message_handler.h" |
26 #include "grit/browser_resources.h" | 26 #include "grit/browser_resources.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
29 #include "ui/base/resource/resource_bundle.h" | 29 #include "ui/base/resource/resource_bundle.h" |
30 | 30 |
31 using chromeos::input_method::ModifierKey; | 31 using chromeos::input_method::ModifierKey; |
32 using content::WebUIMessageHandler; | 32 using content::WebUIMessageHandler; |
33 | 33 |
34 namespace { | 34 namespace { |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 browser->AddSelectedTabWithURL(GURL(kLearnMoreURL), | 301 browser->AddSelectedTabWithURL(GURL(kLearnMoreURL), |
302 content::PAGE_TRANSITION_LINK); | 302 content::PAGE_TRANSITION_LINK); |
303 } | 303 } |
304 | 304 |
305 //////////////////////////////////////////////////////////////////////////////// | 305 //////////////////////////////////////////////////////////////////////////////// |
306 // | 306 // |
307 // KeyboardOverlayUI | 307 // KeyboardOverlayUI |
308 // | 308 // |
309 //////////////////////////////////////////////////////////////////////////////// | 309 //////////////////////////////////////////////////////////////////////////////// |
310 | 310 |
311 KeyboardOverlayUI::KeyboardOverlayUI(WebUI* web_ui) | 311 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui) |
312 : HtmlDialogUI(web_ui) { | 312 : HtmlDialogUI(web_ui) { |
313 Profile* profile = Profile::FromBrowserContext( | 313 Profile* profile = Profile::FromWebUI(web_ui); |
314 web_ui->web_contents()->GetBrowserContext()); | |
315 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); | 314 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile); |
316 web_ui->AddMessageHandler(handler); | 315 web_ui->AddMessageHandler(handler); |
317 | 316 |
318 // Set up the chrome://keyboardoverlay/ source. | 317 // Set up the chrome://keyboardoverlay/ source. |
319 profile->GetChromeURLDataManager()->AddDataSource( | 318 profile->GetChromeURLDataManager()->AddDataSource( |
320 CreateKeyboardOverlayUIHTMLSource()); | 319 CreateKeyboardOverlayUIHTMLSource()); |
321 } | 320 } |
OLD | NEW |