chrome/browser/ui/webui/options/chromeos/proxy_handler.cc - Issue 7342047: Cleanup base/stl_util

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 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed unneeded include + rebase Created 9 years, 5 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

« base/stl_util.h ('K') | « chrome/browser/ui/webui/extension_icon_source.cc ('k') | chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/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-inl.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 "chrome/browser/chromeos/proxy_cros_settings_provider.h"	13 #include "chrome/browser/chromeos/proxy_cros_settings_provider.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"

16 #include "grit/locale_settings.h"	16 #include "grit/locale_settings.h"

17 #include "grit/theme_resources.h"	17 #include "grit/theme_resources.h"

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

19 #include "ui/base/resource/resource_bundle.h"	19 #include "ui/base/resource/resource_bundle.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST));	61 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST));

62 localized_strings->SetString("removeHost",	62 localized_strings->SetString("removeHost",

63 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST));	63 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST));

64 localized_strings->SetString("proxyPort",	64 localized_strings->SetString("proxyPort",

65 l10n_util::GetStringUTF16(IDS_PROXY_PORT));	65 l10n_util::GetStringUTF16(IDS_PROXY_PORT));

66 localized_strings->SetString("proxyBypass",	66 localized_strings->SetString("proxyBypass",

67 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));	67 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));

68 }	68 }

69	69

70 } // namespace chromeos	70 } // namespace chromeos

OLD	NEW