chrome/browser/geolocation/chrome_geolocation_permission_context.cc - Issue 7810002: Move infobar handling to a tab helper.

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/geolocation/chrome_geolocation_permission_context.cc

Issue 7810002: Move infobar handling to a tab helper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/external_tab_container_win.cc ('k') | chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

index d41be1c70216a19a807a09f485dc8a43e5211479..fc7af065f0cf80ee250a035cf7e14642f5ed3e8a 100644

--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/google/google_util.h"

+#include "chrome/browser/infobars/infobar_tab_helper.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/tab_contents/confirm_infobar_delegate.h"

@@ -465,7 +466,7 @@ void GeolocationInfoBarQueueController::ShowQueuedInfoBar(int render_process_id,

tab_contents, this, render_process_id, render_view_id, i->bridge_id,

i->requesting_frame,

profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));

- wrapper->AddInfoBar(i->infobar_delegate);

+ wrapper->infobar_tab_helper()->AddInfoBar(i->infobar_delegate);

}

break;

}

@@ -489,7 +490,7 @@ GeolocationInfoBarQueueController::PendingInfoBarRequests::iterator

// asynchronously.

TabContentsWrapper* wrapper =

TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);

- wrapper->RemoveInfoBar(i->infobar_delegate);

+ wrapper->infobar_tab_helper()->RemoveInfoBar(i->infobar_delegate);

return ++i;

}