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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h" 14 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h"
15 #include "chrome/browser/profiles/profile_io_data.h" 15 #include "chrome/browser/profiles/profile_io_data.h"
16 #include "chrome/common/custom_handlers/protocol_handler.h" 16 #include "chrome/common/custom_handlers/protocol_handler.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/grit/generated_resources.h"
18 #include "components/pref_registry/pref_registry_syncable.h" 19 #include "components/pref_registry/pref_registry_syncable.h"
19 #include "components/user_prefs/user_prefs.h" 20 #include "components/user_prefs/user_prefs.h"
20 #include "content/public/browser/child_process_security_policy.h" 21 #include "content/public/browser/child_process_security_policy.h"
21 #include "grit/generated_resources.h"
22 #include "net/base/network_delegate.h" 22 #include "net/base/network_delegate.h"
23 #include "net/url_request/url_request_redirect_job.h" 23 #include "net/url_request/url_request_redirect_job.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 25
26 using content::BrowserThread; 26 using content::BrowserThread;
27 using content::ChildProcessSecurityPolicy; 27 using content::ChildProcessSecurityPolicy;
28 28
29 namespace { 29 namespace {
30 30
31 const ProtocolHandler& LookupHandler( 31 const ProtocolHandler& LookupHandler(
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 944
945 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 945 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
946 ProtocolHandlerRegistry::CreateJobInterceptorFactory() { 946 ProtocolHandlerRegistry::CreateJobInterceptorFactory() {
947 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 947 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
948 // this is always created on the UI thread (in profile_io's 948 // this is always created on the UI thread (in profile_io's
949 // InitializeOnUIThread. Any method calls must be done 949 // InitializeOnUIThread. Any method calls must be done
950 // on the IO thread (this is checked). 950 // on the IO thread (this is checked).
951 return scoped_ptr<JobInterceptorFactory>( 951 return scoped_ptr<JobInterceptorFactory>(
952 new JobInterceptorFactory(io_thread_delegate_.get())); 952 new JobInterceptorFactory(io_thread_delegate_.get()));
953 } 953 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698