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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. Created 6 years, 7 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
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/extensions/api/content_settings/content_settings_helper s.h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 25 matching lines...) Expand all
36 "block", 36 "block",
37 "ask", 37 "ask",
38 "session_only", 38 "session_only",
39 }; 39 };
40 COMPILE_ASSERT(arraysize(kContentSettingNames) <= 40 COMPILE_ASSERT(arraysize(kContentSettingNames) <=
41 CONTENT_SETTING_NUM_SETTINGS, 41 CONTENT_SETTING_NUM_SETTINGS,
42 content_setting_names_size_invalid); 42 content_setting_names_size_invalid);
43 43
44 // TODO(bauerb): Move this someplace where it can be reused. 44 // TODO(bauerb): Move this someplace where it can be reused.
45 std::string GetDefaultPort(const std::string& scheme) { 45 std::string GetDefaultPort(const std::string& scheme) {
46 if (scheme == content::kHttpScheme) 46 if (scheme == url::kHttpScheme)
47 return "80"; 47 return "80";
48 if (scheme == content::kHttpsScheme) 48 if (scheme == url::kHttpsScheme)
49 return "443"; 49 return "443";
50 NOTREACHED(); 50 NOTREACHED();
51 return std::string(); 51 return std::string();
52 } 52 }
53 53
54 } // namespace 54 } // namespace
55 55
56 namespace extensions { 56 namespace extensions {
57 namespace content_settings_helpers { 57 namespace content_settings_helpers {
58 58
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 140 }
141 141
142 const char* ContentSettingToString(ContentSetting setting) { 142 const char* ContentSettingToString(ContentSetting setting) {
143 size_t index = static_cast<size_t>(setting); 143 size_t index = static_cast<size_t>(setting);
144 DCHECK_LT(index, arraysize(kContentSettingNames)); 144 DCHECK_LT(index, arraysize(kContentSettingNames));
145 return kContentSettingNames[index]; 145 return kContentSettingNames[index];
146 } 146 }
147 147
148 } // namespace content_settings_helpers 148 } // namespace content_settings_helpers
149 } // namespace extensions 149 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698