chrome/browser/geolocation/chrome_geolocation_permission_context.cc - Issue 10387110: Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID.

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 10387110: Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove stray comment Created 8 years, 7 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/extensions/api/web_navigation/web_navigation_api.cc ('k') | chrome/browser/speech/chrome_speech_recognition_manager_delegate.h » ('j') | chrome/common/chrome_view_type.h » ('J')
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 c9a3ff8bd88ff659eb78256f4176e1b8b56e1858..4d2465bd90d422529853355842fcc146d53f3a00 100644

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

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

@@ -22,6 +22,7 @@

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

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

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/chrome_view_type.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/pref_names.h"

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

@@ -624,7 +625,7 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission(

WebContents* web_contents =

tab_util::GetWebContentsByID(render_process_id, render_view_id);

if (!web_contents || web_contents->GetViewType() !=

- content::VIEW_TYPE_WEB_CONTENTS) {

+ chrome::VIEW_TYPE_TAB_CONTENTS) {

// The tab may have gone away, or the request may not be from a tab at all.

// TODO(mpcomplete): the request could be from a background page or

// extension popup (tab_contents will have a different ViewType). But why do