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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 9909019: Add schema chrome-extension-resource:// for extension resources (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Make some test flaky for OSX 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_resource_protocols.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 "chrome/browser/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 #if !defined(OS_ANDROID) 142 #if !defined(OS_ANDROID)
143 // Must be created after the NotificationService. 143 // Must be created after the NotificationService.
144 print_job_manager_.reset(new printing::PrintJobManager); 144 print_job_manager_.reset(new printing::PrintJobManager);
145 #endif 145 #endif
146 146
147 net_log_.reset(new ChromeNetLog); 147 net_log_.reset(new ChromeNetLog);
148 148
149 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 149 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
150 chrome::kExtensionScheme); 150 chrome::kExtensionScheme);
151 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
152 chrome::kExtensionResourceScheme);
151 153
152 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; 154 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder;
153 155
154 ExtensionTabIdMap::GetInstance()->Init(); 156 ExtensionTabIdMap::GetInstance()->Init();
155 } 157 }
156 158
157 BrowserProcessImpl::~BrowserProcessImpl() { 159 BrowserProcessImpl::~BrowserProcessImpl() {
158 #if !defined(OS_ANDROID) 160 #if !defined(OS_ANDROID)
159 // Wait for the pending print jobs to finish. 161 // Wait for the pending print jobs to finish.
160 print_job_manager_->OnQuit(); 162 print_job_manager_->OnQuit();
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 } 918 }
917 919
918 void BrowserProcessImpl::OnAutoupdateTimer() { 920 void BrowserProcessImpl::OnAutoupdateTimer() {
919 if (CanAutorestartForUpdate()) { 921 if (CanAutorestartForUpdate()) {
920 DLOG(WARNING) << "Detected update. Restarting browser."; 922 DLOG(WARNING) << "Detected update. Restarting browser.";
921 RestartBackgroundInstance(); 923 RestartBackgroundInstance();
922 } 924 }
923 } 925 }
924 926
925 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 927 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_resource_protocols.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698