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

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

Issue 8423055: [Aura] Initial app list webui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos bot compilation error 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 insert(chrome::kChromeUISyncPromoHost); 75 insert(chrome::kChromeUISyncPromoHost);
76 #endif 76 #endif
77 #if defined(TOUCH_UI) 77 #if defined(TOUCH_UI)
78 insert(chrome::kChromeUIKeyboardHost); 78 insert(chrome::kChromeUIKeyboardHost);
79 #endif 79 #endif
80 #if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA) 80 #if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
81 insert(chrome::kChromeUICollectedCookiesHost); 81 insert(chrome::kChromeUICollectedCookiesHost);
82 insert(chrome::kChromeUIHttpAuthHost); 82 insert(chrome::kChromeUIHttpAuthHost);
83 insert(chrome::kChromeUIRepostFormWarningHost); 83 insert(chrome::kChromeUIRepostFormWarningHost);
84 #endif 84 #endif
85 #if defined(USE_AURA)
86 insert(chrome::kChromeUIAppListHost);
87 #endif
85 } 88 }
86 }; 89 };
87 90
88 base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet> 91 base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet>
89 g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED); 92 g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED);
90 93
91 // Parse a URL into the components used to resolve its request. |source_name| 94 // Parse a URL into the components used to resolve its request. |source_name|
92 // is the hostname and |path| is the remaining portion of the URL. 95 // is the hostname and |path| is the remaining portion of the URL.
93 void URLToRequest(const GURL& url, std::string* source_name, 96 void URLToRequest(const GURL& url, std::string* source_name,
94 std::string* path) { 97 std::string* path) {
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 551
549 return new URLRequestChromeJob(request, backend_); 552 return new URLRequestChromeJob(request, backend_);
550 } 553 }
551 554
552 } // namespace 555 } // namespace
553 556
554 net::URLRequestJobFactory::ProtocolHandler* 557 net::URLRequestJobFactory::ProtocolHandler*
555 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) { 558 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) {
556 return new DevToolsJobFactory(backend); 559 return new DevToolsJobFactory(backend);
557 } 560 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698