chrome/browser/ui/webui/options/chromeos/pointer_handler.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/options/chromeos/pointer_handler.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/options/chromeos/language_options_util.h ('k') | chrome/browser/ui/webui/options/chromeos/proxy_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/options/chromeos/pointer_handler.h"	5 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

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

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

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

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

13 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16 namespace options {	16 namespace options {

17	17

18 PointerHandler::PointerHandler()	18 PointerHandler::PointerHandler()

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 "pointerOverlayTitleTouchpadOnly";	75 "pointerOverlayTitleTouchpadOnly";

76 } else {	76 } else {

77 label = has_mouse_ ? "pointerOverlayTitleMouseOnly" : "";	77 label = has_mouse_ ? "pointerOverlayTitleMouseOnly" : "";

78 }	78 }

79 base::StringValue val(label);	79 base::StringValue val(label);

80 web_ui()->CallJavascriptFunction("PointerOverlay.setTitle", val);	80 web_ui()->CallJavascriptFunction("PointerOverlay.setTitle", val);

81 }	81 }

82	82

83 } // namespace options	83 } // namespace options

84 } // namespace chromeos	84 } // namespace chromeos

OLD	NEW