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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 7248008: Fix content script injection when multi-profiles are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the early return to the top of SendUpdate. Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | no next file » | 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) 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/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/stl_util-inl.h" 13 #include "base/stl_util-inl.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/content_settings/host_content_settings_map.h" 16 #include "chrome/browser/content_settings/host_content_settings_map.h"
17 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 17 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
18 #include "chrome/browser/extensions/extension_protocols.h" 18 #include "chrome/browser/extensions/extension_protocols.h"
19 #include "chrome/browser/extensions/user_script_master.h"
20 #include "chrome/browser/io_thread.h" 19 #include "chrome/browser/io_thread.h"
21 #include "chrome/browser/net/chrome_cookie_notification_details.h" 20 #include "chrome/browser/net/chrome_cookie_notification_details.h"
22 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" 21 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
23 #include "chrome/browser/net/chrome_net_log.h" 22 #include "chrome/browser/net/chrome_net_log.h"
24 #include "chrome/browser/net/chrome_network_delegate.h" 23 #include "chrome/browser/net/chrome_network_delegate.h"
25 #include "chrome/browser/net/metadata_url_request.h" 24 #include "chrome/browser/net/metadata_url_request.h"
26 #include "chrome/browser/net/pref_proxy_config_service.h" 25 #include "chrome/browser/net/pref_proxy_config_service.h"
27 #include "chrome/browser/net/proxy_service_factory.h" 26 #include "chrome/browser/net/proxy_service_factory.h"
28 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 27 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
29 #include "chrome/browser/prefs/pref_service.h" 28 #include "chrome/browser/prefs/pref_service.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 context->set_appcache_service(profile_params_->appcache_service); 511 context->set_appcache_service(profile_params_->appcache_service);
513 context->set_blob_storage_context(profile_params_->blob_storage_context); 512 context->set_blob_storage_context(profile_params_->blob_storage_context);
514 context->set_file_system_context(profile_params_->file_system_context); 513 context->set_file_system_context(profile_params_->file_system_context);
515 context->set_extension_info_map(profile_params_->extension_info_map); 514 context->set_extension_info_map(profile_params_->extension_info_map);
516 } 515 }
517 516
518 void ProfileIOData::ShutdownOnUIThread() { 517 void ProfileIOData::ShutdownOnUIThread() {
519 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 518 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
520 enable_referrers_.Destroy(); 519 enable_referrers_.Destroy();
521 } 520 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698