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

Side by Side Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix CrOS Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/chrome_url_data_manager_backend.h" 5 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #endif 76 #endif
77 #if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA) 77 #if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
78 insert(chrome::kChromeUICollectedCookiesHost); 78 insert(chrome::kChromeUICollectedCookiesHost);
79 insert(chrome::kChromeUIHttpAuthHost); 79 insert(chrome::kChromeUIHttpAuthHost);
80 insert(chrome::kChromeUIRepostFormWarningHost); 80 insert(chrome::kChromeUIRepostFormWarningHost);
81 #endif 81 #endif
82 } 82 }
83 }; 83 };
84 84
85 base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet> 85 base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet>
86 g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED); 86 g_chrome_url_content_security_policy_exceptions = LINKER_ZERO_INITIALIZED;
87 87
88 // Parse a URL into the components used to resolve its request. |source_name| 88 // Parse a URL into the components used to resolve its request. |source_name|
89 // is the hostname and |path| is the remaining portion of the URL. 89 // is the hostname and |path| is the remaining portion of the URL.
90 void URLToRequest(const GURL& url, std::string* source_name, 90 void URLToRequest(const GURL& url, std::string* source_name,
91 std::string* path) { 91 std::string* path) {
92 DCHECK(url.SchemeIs(chrome::kChromeDevToolsScheme) || 92 DCHECK(url.SchemeIs(chrome::kChromeDevToolsScheme) ||
93 url.SchemeIs(chrome::kChromeUIScheme)); 93 url.SchemeIs(chrome::kChromeUIScheme));
94 94
95 if (!url.is_valid()) { 95 if (!url.is_valid()) {
96 NOTREACHED(); 96 NOTREACHED();
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 545
546 return new URLRequestChromeJob(request, backend_); 546 return new URLRequestChromeJob(request, backend_);
547 } 547 }
548 548
549 } // namespace 549 } // namespace
550 550
551 net::URLRequestJobFactory::ProtocolHandler* 551 net::URLRequestJobFactory::ProtocolHandler*
552 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) { 552 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) {
553 return new DevToolsJobFactory(backend); 553 return new DevToolsJobFactory(backend);
554 } 554 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698