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

Unified Diff: content/common/url_schemes.cc

Issue 10383298: Move RegisterContentSchemes from public url_constants into non-public url_schemes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: allow content/common/savable_url_schemes.h to be included by url_constants.cc Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/url_schemes.h ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/url_schemes.cc
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9db48723ad38be1c4cbe9dc8d8e280563c55a9f0
--- /dev/null
+++ b/content/common/url_schemes.cc
@@ -0,0 +1,79 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/common/url_schemes.h"
+
+#include <string.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/string_util.h"
+#include "content/common/savable_url_schemes.h"
+#include "content/public/common/content_client.h"
+#include "content/public/common/url_constants.h"
+#include "googleurl/src/url_util.h"
+
+namespace {
+
+void AddStandardSchemeHelper(const std::string& scheme) {
+ url_util::AddStandardScheme(scheme.c_str());
+}
+
+} // namespace
+
+namespace content {
+
+void RegisterContentSchemes(bool lock_standard_schemes) {
+ std::vector<std::string> additional_standard_schemes;
+ std::vector<std::string> additional_savable_schemes;
+ GetContentClient()->AddAdditionalSchemes(
+ &additional_standard_schemes,
+ &additional_savable_schemes);
+
+ // Don't need "chrome-internal" which was used in old versions of Chrome for
+ // the new tab page.
+ url_util::AddStandardScheme(chrome::kChromeDevToolsScheme);
+ url_util::AddStandardScheme(chrome::kChromeUIScheme);
+ url_util::AddStandardScheme(chrome::kMetadataScheme);
+ std::for_each(additional_standard_schemes.begin(),
+ additional_standard_schemes.end(),
+ AddStandardSchemeHelper);
+
+ // Prevent future modification of the standard schemes list. This is to
+ // prevent accidental creation of data races in the program. AddStandardScheme
+ // isn't threadsafe so must be called when GURL isn't used on any other
+ // thread. This is really easy to mess up, so we say that all calls to
+ // AddStandardScheme in Chrome must be inside this function.
+ if (lock_standard_schemes)
+ url_util::LockStandardSchemes();
+
+ // We rely on the above lock to protect this part from being invoked twice.
+ if (!additional_savable_schemes.empty()) {
+ const char* const* default_schemes = GetSavableSchemesInternal();
+ const char* const* default_schemes_end = NULL;
+ for (default_schemes_end = default_schemes; *default_schemes_end;
+ ++default_schemes_end) {}
+ const int default_schemes_count = default_schemes_end - default_schemes;
+
+ int schemes = static_cast<int>(additional_savable_schemes.size());
+ // The array, and the copied schemes won't be freed, but will remain
+ // reachable.
+ char **savable_schemes = new char*[schemes + default_schemes_count + 1];
+ memcpy(savable_schemes,
+ default_schemes,
+ default_schemes_count * sizeof(default_schemes[0]));
+ for (int i = 0; i < schemes; ++i) {
+ savable_schemes[default_schemes_count + i] =
+ base::strdup(additional_savable_schemes[i].c_str());
+ }
+ savable_schemes[default_schemes_count + schemes] = 0;
+
+ SetSavableSchemes(savable_schemes);
+ }
+}
+
+} // namespace content
« no previous file with comments | « content/common/url_schemes.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698