chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc - Issue 14427002: Move InputMethodManager from c/b/chromeos to chromeos

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

Issue 14427002: Move InputMethodManager from c/b/chromeos to chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removing old header Created 7 years, 8 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 "ash/display/display_manager.h"	7 #include "ash/display/display_manager.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

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

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

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"	16 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"

17 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

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

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

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

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

	21 #include "chromeos/ime/input_method_manager.h"

22 #include "chromeos/ime/xkeyboard.h"	22 #include "chromeos/ime/xkeyboard.h"

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

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

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

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

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

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

29 #include "grit/browser_resources.h"	29 #include "grit/browser_resources.h"

30 #include "grit/chromium_strings.h"	30 #include "grit/chromium_strings.h"

31 #include "grit/generated_resources.h"	31 #include "grit/generated_resources.h"

(...skipping 340 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
372	372

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

374 : WebDialogUI(web_ui) {	374 : WebDialogUI(web_ui) {

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

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

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

378	378

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

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

381 }	381 }

OLD	NEW