chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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/webui/chromeos/imageburner/imageburner_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/strings/utf_string_conversions.h"

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

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

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

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

19 #include "chromeos/chromeos_switches.h"	19 #include "chromeos/chromeos_switches.h"

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

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

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

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

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

(...skipping 347 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