chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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

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/command_line.h"	9 #include "base/command_line.h"

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

	11 #include "base/prefs/pref_service.h"

11 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

12 #include "base/values.h"	13 #include "base/values.h"

13 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"	14 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"

14 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	15 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

15 #include "chrome/browser/chromeos/input_method/xkeyboard.h"	16 #include "chrome/browser/chromeos/input_method/xkeyboard.h"

16 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

20 #include "chrome/common/url_constants.h"	20 #include "chrome/common/url_constants.h"

21 #include "content/public/browser/page_navigator.h"	21 #include "content/public/browser/page_navigator.h"

22 #include "content/public/browser/web_contents.h"	22 #include "content/public/browser/web_contents.h"

23 #include "content/public/browser/web_contents_delegate.h"	23 #include "content/public/browser/web_contents_delegate.h"

24 #include "content/public/browser/web_ui.h"	24 #include "content/public/browser/web_ui.h"

25 #include "content/public/browser/web_ui_data_source.h"	25 #include "content/public/browser/web_ui_data_source.h"

26 #include "content/public/browser/web_ui_message_handler.h"	26 #include "content/public/browser/web_ui_message_handler.h"

(...skipping 333 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
360	360

361 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)	361 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)

362 : WebDialogUI(web_ui) {	362 : WebDialogUI(web_ui) {

363 Profile* profile = Profile::FromWebUI(web_ui);	363 Profile* profile = Profile::FromWebUI(web_ui);

364 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);	364 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);

365 web_ui->AddMessageHandler(handler);	365 web_ui->AddMessageHandler(handler);

366	366

367 // Set up the chrome://keyboardoverlay/ source.	367 // Set up the chrome://keyboardoverlay/ source.

368 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());	368 content::WebUIDataSource::Add(profile, CreateKeyboardOverlayUIHTMLSource());

369 }	369 }

OLD	NEW