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

Side by Side Diff: chrome_frame/policy_settings.cc

Issue 16391006: Use a direct include of strings headers in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_frame/navigation_constraints.cc ('k') | chrome_frame/protocol_sink_wrap.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_frame/policy_settings.h" 5 #include "chrome_frame/policy_settings.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/win/registry.h" 12 #include "base/win/registry.h"
13 #include "chrome_frame/utils.h" 13 #include "chrome_frame/utils.h"
14 #include "policy/policy_constants.h" 14 #include "policy/policy_constants.h"
15 15
16 namespace { 16 namespace {
17 17
18 // This array specifies the order in which registry keys are tested. Do not 18 // This array specifies the order in which registry keys are tested. Do not
19 // change this unless the decision is made product-wide (i.e., in Chrome's 19 // change this unless the decision is made product-wide (i.e., in Chrome's
20 // configuration policy provider). 20 // configuration policy provider).
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 swap(renderer_exclusion_list_, renderer_exclusion_list); 164 swap(renderer_exclusion_list_, renderer_exclusion_list);
165 swap(content_type_list_, content_type_list); 165 swap(content_type_list_, content_type_list);
166 swap(application_locale_, application_locale); 166 swap(application_locale_, application_locale);
167 swap(additional_launch_parameters_, additional_launch_parameters); 167 swap(additional_launch_parameters_, additional_launch_parameters);
168 } 168 }
169 169
170 // static 170 // static
171 PolicySettings* PolicySettings::GetInstance() { 171 PolicySettings* PolicySettings::GetInstance() {
172 return Singleton<PolicySettings>::get(); 172 return Singleton<PolicySettings>::get();
173 } 173 }
OLDNEW
« no previous file with comments | « chrome_frame/navigation_constraints.cc ('k') | chrome_frame/protocol_sink_wrap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698