OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile_impl.h" | 5 #include "chrome/browser/profile_impl.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/env_var.h" | 9 #include "base/env_var.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 ChromeThread::PostTask( | 162 ChromeThread::PostTask( |
163 ChromeThread::IO, FROM_HERE, | 163 ChromeThread::IO, FROM_HERE, |
164 NewRunnableMethod(getter, | 164 NewRunnableMethod(getter, |
165 &ChromeURLRequestContextGetter::OnNewExtensions, | 165 &ChromeURLRequestContextGetter::OnNewExtensions, |
166 extension->id(), | 166 extension->id(), |
167 new ChromeURLRequestContext::ExtensionInfo( | 167 new ChromeURLRequestContext::ExtensionInfo( |
168 extension->name(), | 168 extension->name(), |
169 extension->path(), | 169 extension->path(), |
170 extension->default_locale(), | 170 extension->default_locale(), |
171 extension->web_extent(), | 171 extension->web_extent(), |
| 172 extension->GetEffectiveHostPermissions(), |
172 extension->api_permissions()))); | 173 extension->api_permissions()))); |
173 } | 174 } |
174 | 175 |
175 void PostExtensionUnloadedToContextGetter(ChromeURLRequestContextGetter* getter, | 176 void PostExtensionUnloadedToContextGetter(ChromeURLRequestContextGetter* getter, |
176 Extension* extension) { | 177 Extension* extension) { |
177 if (!getter) | 178 if (!getter) |
178 return; | 179 return; |
179 ChromeThread::PostTask( | 180 ChromeThread::PostTask( |
180 ChromeThread::IO, FROM_HERE, | 181 ChromeThread::IO, FROM_HERE, |
181 NewRunnableMethod(getter, | 182 NewRunnableMethod(getter, |
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1168 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); | 1169 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); |
1169 sync_service_.reset( | 1170 sync_service_.reset( |
1170 profile_sync_factory_->CreateProfileSyncService()); | 1171 profile_sync_factory_->CreateProfileSyncService()); |
1171 sync_service_->Initialize(); | 1172 sync_service_->Initialize(); |
1172 } | 1173 } |
1173 | 1174 |
1174 void ProfileImpl::InitCloudPrintProxyService() { | 1175 void ProfileImpl::InitCloudPrintProxyService() { |
1175 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); | 1176 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); |
1176 cloud_print_proxy_service_->Initialize(); | 1177 cloud_print_proxy_service_->Initialize(); |
1177 } | 1178 } |
OLD | NEW |