chrome/browser/download/download_request_limiter.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/download/download_request_limiter.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 12 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/download/download_request_limiter.h ('k') | chrome/browser/download/download_request_limiter_unittest.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_request_limiter.cc

===================================================================

--- chrome/browser/download/download_request_limiter.cc (revision 116232)

+++ chrome/browser/download/download_request_limiter.cc (working copy)

@@ -12,9 +12,9 @@

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/tab_contents.h"

#include "content/public/browser/browser_thread.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/notification_types.h"

@@ -28,8 +28,8 @@

DownloadRequestLimiter::TabDownloadState::TabDownloadState(

DownloadRequestLimiter* host,

- NavigationController* controller,

- NavigationController* originating_controller)

+ content::NavigationController* controller,

+ content::NavigationController* originating_controller)

: host_(host),

controller_(controller),

status_(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD),

@@ -231,8 +231,8 @@

}

DownloadRequestLimiter::TabDownloadState* DownloadRequestLimiter::

- GetDownloadState(NavigationController* controller,

- NavigationController* originating_controller,

+ GetDownloadState(content::NavigationController* controller,

+ content::NavigationController* originating_controller,

bool create) {

DCHECK(controller);

StateMap::iterator i = state_map_.find(controller);