chrome/browser/ui/webui/options/chromeos/proxy_handler.cc - Issue 10837331: Options: s/options2/options/.

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/proxy_handler.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wut 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/proxy_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/set_wallpaper_options_handler.h » ('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/options2/chromeos/proxy_handler.h"	5 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"

6	6

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

8 #include "base/callback.h"	8 #include "base/callback.h"

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

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

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

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

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

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

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

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 RegisterStrings(localized_strings, resources, arraysize(resources));	56 RegisterStrings(localized_strings, resources, arraysize(resources));

57	57

58 localized_strings->SetString("enableSharedProxiesBannerText",	58 localized_strings->SetString("enableSharedProxiesBannerText",

59 l10n_util::GetStringFUTF16(	59 l10n_util::GetStringFUTF16(

60 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,	60 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,

61 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));	61 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));

62 }	62 }

63	63

64 } // namespace options	64 } // namespace options

65 } // namespace chromeos	65 } // namespace chromeos

OLD	NEW