OLD | NEW |
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 21 matching lines...) Expand all Loading... |
32 std::vector<std::string> additional_savable_schemes; | 32 std::vector<std::string> additional_savable_schemes; |
33 GetContentClient()->AddAdditionalSchemes( | 33 GetContentClient()->AddAdditionalSchemes( |
34 &additional_standard_schemes, | 34 &additional_standard_schemes, |
35 &additional_savable_schemes); | 35 &additional_savable_schemes); |
36 | 36 |
37 // Don't need "chrome-internal" which was used in old versions of Chrome for | 37 // Don't need "chrome-internal" which was used in old versions of Chrome for |
38 // the new tab page. | 38 // the new tab page. |
39 url_util::AddStandardScheme(chrome::kChromeDevToolsScheme); | 39 url_util::AddStandardScheme(chrome::kChromeDevToolsScheme); |
40 url_util::AddStandardScheme(chrome::kChromeUIScheme); | 40 url_util::AddStandardScheme(chrome::kChromeUIScheme); |
41 url_util::AddStandardScheme(chrome::kMetadataScheme); | 41 url_util::AddStandardScheme(chrome::kMetadataScheme); |
| 42 url_util::AddStandardScheme(chrome::kGuestScheme); |
42 std::for_each(additional_standard_schemes.begin(), | 43 std::for_each(additional_standard_schemes.begin(), |
43 additional_standard_schemes.end(), | 44 additional_standard_schemes.end(), |
44 AddStandardSchemeHelper); | 45 AddStandardSchemeHelper); |
45 | 46 |
46 // Prevent future modification of the standard schemes list. This is to | 47 // Prevent future modification of the standard schemes list. This is to |
47 // prevent accidental creation of data races in the program. AddStandardScheme | 48 // prevent accidental creation of data races in the program. AddStandardScheme |
48 // isn't threadsafe so must be called when GURL isn't used on any other | 49 // isn't threadsafe so must be called when GURL isn't used on any other |
49 // thread. This is really easy to mess up, so we say that all calls to | 50 // thread. This is really easy to mess up, so we say that all calls to |
50 // AddStandardScheme in Chrome must be inside this function. | 51 // AddStandardScheme in Chrome must be inside this function. |
51 if (lock_standard_schemes) | 52 if (lock_standard_schemes) |
(...skipping 18 matching lines...) Expand all Loading... |
70 savable_schemes[default_schemes_count + i] = | 71 savable_schemes[default_schemes_count + i] = |
71 base::strdup(additional_savable_schemes[i].c_str()); | 72 base::strdup(additional_savable_schemes[i].c_str()); |
72 } | 73 } |
73 savable_schemes[default_schemes_count + schemes] = 0; | 74 savable_schemes[default_schemes_count + schemes] = 0; |
74 | 75 |
75 SetSavableSchemes(savable_schemes); | 76 SetSavableSchemes(savable_schemes); |
76 } | 77 } |
77 } | 78 } |
78 | 79 |
79 } // namespace content | 80 } // namespace content |
OLD | NEW |