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

Side by Side Diff: chrome/browser/custom_handlers/protocol_handler_registry.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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/custom_handlers/protocol_handler_registry.h" 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/prefs/pref_service.h"
16 #include "build/build_config.h" 15 #include "build/build_config.h"
17 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/profiles/profile_io_data.h" 17 #include "chrome/browser/profiles/profile_io_data.h"
19 #include "chrome/common/custom_handlers/protocol_handler.h" 18 #include "chrome/common/custom_handlers/protocol_handler.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
22 #include "components/pref_registry/pref_registry_syncable.h" 21 #include "components/pref_registry/pref_registry_syncable.h"
22 #include "components/prefs/pref_service.h"
23 #include "components/user_prefs/user_prefs.h" 23 #include "components/user_prefs/user_prefs.h"
24 #include "content/public/browser/child_process_security_policy.h" 24 #include "content/public/browser/child_process_security_policy.h"
25 #include "net/base/network_delegate.h" 25 #include "net/base/network_delegate.h"
26 #include "net/url_request/url_request_redirect_job.h" 26 #include "net/url_request/url_request_redirect_job.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 28
29 using content::BrowserThread; 29 using content::BrowserThread;
30 using content::ChildProcessSecurityPolicy; 30 using content::ChildProcessSecurityPolicy;
31 31
32 namespace { 32 namespace {
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 966
967 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 967 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
968 ProtocolHandlerRegistry::CreateJobInterceptorFactory() { 968 ProtocolHandlerRegistry::CreateJobInterceptorFactory() {
969 DCHECK_CURRENTLY_ON(BrowserThread::UI); 969 DCHECK_CURRENTLY_ON(BrowserThread::UI);
970 // this is always created on the UI thread (in profile_io's 970 // this is always created on the UI thread (in profile_io's
971 // InitializeOnUIThread. Any method calls must be done 971 // InitializeOnUIThread. Any method calls must be done
972 // on the IO thread (this is checked). 972 // on the IO thread (this is checked).
973 return scoped_ptr<JobInterceptorFactory>( 973 return scoped_ptr<JobInterceptorFactory>(
974 new JobInterceptorFactory(io_thread_delegate_.get())); 974 new JobInterceptorFactory(io_thread_delegate_.get()));
975 } 975 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698