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

Side by Side Diff: content/common/url_schemes.cc

Issue 2403713002: Add suborigin logic to url::Origin (Closed)
Patch Set: Fix unit test Created 4 years, 1 month 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
« no previous file with comments | « content/common/origin_util_unittest.cc ('k') | content/public/browser/dom_storage_context.h » ('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 "content/common/url_schemes.h" 5 #include "content/common/url_schemes.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 17 matching lines...) Expand all
28 std::vector<std::string> additional_savable_schemes; 28 std::vector<std::string> additional_savable_schemes;
29 29
30 GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes, 30 GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
31 &additional_referrer_schemes, 31 &additional_referrer_schemes,
32 &additional_savable_schemes); 32 &additional_savable_schemes);
33 33
34 url::AddStandardScheme(kChromeDevToolsScheme, url::SCHEME_WITHOUT_PORT); 34 url::AddStandardScheme(kChromeDevToolsScheme, url::SCHEME_WITHOUT_PORT);
35 url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT); 35 url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT);
36 url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT); 36 url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT);
37 37
38 url::AddStandardScheme(kHttpSuboriginScheme, url::SCHEME_WITH_PORT);
39 url::AddReferrerScheme(kHttpSuboriginScheme, url::SCHEME_WITH_PORT);
40 url::AddStandardScheme(kHttpsSuboriginScheme, url::SCHEME_WITH_PORT);
41 url::AddReferrerScheme(kHttpsSuboriginScheme, url::SCHEME_WITH_PORT);
42
43 for (const url::SchemeWithType& scheme : additional_standard_schemes) 38 for (const url::SchemeWithType& scheme : additional_standard_schemes)
44 url::AddStandardScheme(scheme.scheme, scheme.type); 39 url::AddStandardScheme(scheme.scheme, scheme.type);
45 40
46 for (const url::SchemeWithType& scheme : additional_referrer_schemes) 41 for (const url::SchemeWithType& scheme : additional_referrer_schemes)
47 url::AddReferrerScheme(scheme.scheme, scheme.type); 42 url::AddReferrerScheme(scheme.scheme, scheme.type);
48 43
49 // Prevent future modification of the scheme lists. This is to prevent 44 // Prevent future modification of the scheme lists. This is to prevent
50 // accidental creation of data races in the program. Add*Scheme aren't 45 // accidental creation of data races in the program. Add*Scheme aren't
51 // threadsafe so must be called when GURL isn't used on any other thread. This 46 // threadsafe so must be called when GURL isn't used on any other thread. This
52 // is really easy to mess up, so we say that all calls to Add*Scheme in Chrome 47 // is really easy to mess up, so we say that all calls to Add*Scheme in Chrome
(...skipping 20 matching lines...) Expand all
73 savable_schemes[default_schemes_count + i] = 68 savable_schemes[default_schemes_count + i] =
74 base::strdup(additional_savable_schemes[i].c_str()); 69 base::strdup(additional_savable_schemes[i].c_str());
75 } 70 }
76 savable_schemes[default_schemes_count + schemes] = 0; 71 savable_schemes[default_schemes_count + schemes] = 0;
77 72
78 SetSavableSchemes(savable_schemes); 73 SetSavableSchemes(savable_schemes);
79 } 74 }
80 } 75 }
81 76
82 } // namespace content 77 } // namespace content
OLDNEW
« no previous file with comments | « content/common/origin_util_unittest.cc ('k') | content/public/browser/dom_storage_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698