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

Side by Side Diff: chrome/browser/chromeos/dom_ui/proxy_handler.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/chromeos/dom_ui/proxy_handler.h" 5 #include "chrome/browser/chromeos/dom_ui/proxy_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/basictypes.h" 8 #include "base/basictypes.h"
10 #include "base/callback.h" 9 #include "base/callback.h"
11 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
12 #include "base/time.h" 11 #include "base/time.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/chromeos/proxy_cros_settings_provider.h" 14 #include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
16 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
17 #include "grit/chromium_strings.h" 16 #include "grit/chromium_strings.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "grit/locale_settings.h" 18 #include "grit/locale_settings.h"
20 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "ui/base/resource/resource_bundle.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 ProxyHandler::ProxyHandler() 24 ProxyHandler::ProxyHandler()
25 : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider()) { 25 : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider()) {
26 } 26 }
27 27
28 ProxyHandler::~ProxyHandler() { 28 ProxyHandler::~ProxyHandler() {
29 } 29 }
30 30
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST)); 62 l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST));
63 localized_strings->SetString("removeHost", 63 localized_strings->SetString("removeHost",
64 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST)); 64 l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST));
65 localized_strings->SetString("proxyPort", 65 localized_strings->SetString("proxyPort",
66 l10n_util::GetStringUTF16(IDS_PROXY_PORT)); 66 l10n_util::GetStringUTF16(IDS_PROXY_PORT));
67 localized_strings->SetString("proxyBypass", 67 localized_strings->SetString("proxyBypass",
68 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS)); 68 l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));
69 } 69 }
70 70
71 } // namespace chromeos 71 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc ('k') | chrome/browser/chromeos/dom_ui/register_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698