Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

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

Issue 10857071: Options: Rename options2 namespace to options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix. Created 8 years, 4 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
OLDNEW
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/options2/chromeos/pointer_handler.h" 5 #include "chrome/browser/ui/webui/options2/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/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 options2 { 16 namespace options {
17 17
18 PointerHandler::PointerHandler() 18 PointerHandler::PointerHandler()
19 : has_touchpad_(false), 19 : has_touchpad_(false),
20 has_mouse_(false) { 20 has_mouse_(false) {
21 } 21 }
22 22
23 PointerHandler::~PointerHandler() { 23 PointerHandler::~PointerHandler() {
24 } 24 }
25 25
26 void PointerHandler::GetLocalizedValues(DictionaryValue* localized_strings) { 26 void PointerHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 if (has_touchpad_) { 71 if (has_touchpad_) {
72 label = has_mouse_ ? "pointerOverlayTitleTouchpadMouse" : 72 label = has_mouse_ ? "pointerOverlayTitleTouchpadMouse" :
73 "pointerOverlayTitleTouchpadOnly"; 73 "pointerOverlayTitleTouchpadOnly";
74 } else { 74 } else {
75 label = has_mouse_ ? "pointerOverlayTitleMouseOnly" : ""; 75 label = has_mouse_ ? "pointerOverlayTitleMouseOnly" : "";
76 } 76 }
77 base::StringValue val(label); 77 base::StringValue val(label);
78 web_ui()->CallJavascriptFunction("PointerOverlay.setTitle", val); 78 web_ui()->CallJavascriptFunction("PointerOverlay.setTitle", val);
79 } 79 }
80 80
81 } // namespace options2 81 } // namespace options
82 } // namespace chromeos 82 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/pointer_handler.h ('k') | chrome/browser/ui/webui/options2/chromeos/proxy_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698