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

Side by Side Diff: content/shell/browser/shell_resource_dispatcher_host_delegate.cc

Issue 124113003: Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 5 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/shell/browser/shell_login_dialog.h" 8 #include "content/shell/browser/shell_login_dialog.h"
9 #include "content/shell/common/shell_switches.h" 9 #include "content/shell/common/shell_switches.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 ShellResourceDispatcherHostDelegate::ShellResourceDispatcherHostDelegate() { 13 ShellResourceDispatcherHostDelegate::ShellResourceDispatcherHostDelegate() {
14 } 14 }
15 15
16 ShellResourceDispatcherHostDelegate::~ShellResourceDispatcherHostDelegate() { 16 ShellResourceDispatcherHostDelegate::~ShellResourceDispatcherHostDelegate() {
17 } 17 }
18 18
19 bool ShellResourceDispatcherHostDelegate::AcceptAuthRequest(
20 net::URLRequest* request,
21 net::AuthChallengeInfo* auth_info) {
22 bool accept_auth_request =
23 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
24 return accept_auth_request;
25 }
26
27 ResourceDispatcherHostLoginDelegate* 19 ResourceDispatcherHostLoginDelegate*
28 ShellResourceDispatcherHostDelegate::CreateLoginDelegate( 20 ShellResourceDispatcherHostDelegate::CreateLoginDelegate(
29 net::AuthChallengeInfo* auth_info, net::URLRequest* request) { 21 net::AuthChallengeInfo* auth_info, net::URLRequest* request) {
22 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
23 return NULL;
24
30 if (!login_request_callback_.is_null()) { 25 if (!login_request_callback_.is_null()) {
31 login_request_callback_.Run(); 26 login_request_callback_.Run();
32 login_request_callback_.Reset(); 27 login_request_callback_.Reset();
33 return NULL; 28 return NULL;
34 } 29 }
35 30
36 #if !defined(OS_MACOSX) && !defined(TOOLKIT_GTK) 31 #if !defined(OS_MACOSX) && !defined(TOOLKIT_GTK)
37 // TODO: implement ShellLoginDialog for other platforms, drop this #if 32 // TODO: implement ShellLoginDialog for other platforms, drop this #if
38 return NULL; 33 return NULL;
39 #else 34 #else
40 return new ShellLoginDialog(auth_info, request); 35 return new ShellLoginDialog(auth_info, request);
41 #endif 36 #endif
42 } 37 }
43 38
44 } // namespace content 39 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698