summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-14 06:44:03 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-14 06:44:03 +0000
commitc8160f231fb0ab3827bf90b65c5573b6c339c165 (patch)
tree68e29c6432e8190cbb65520d8d18cacd62df4cad /chrome/browser/geolocation
parent72439465e27275cd043ec0506771ca35c2e52793 (diff)
downloadchromium_src-c8160f231fb0ab3827bf90b65c5573b6c339c165.zip
chromium_src-c8160f231fb0ab3827bf90b65c5573b6c339c165.tar.gz
chromium_src-c8160f231fb0ab3827bf90b65c5573b6c339c165.tar.bz2
Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID.
The view type enum is supposed to represent the 'type of view' in the user sense, so 'tab', 'background page', 'popup', etc. A 'web contents' is not a type of view, it's an implementation detail of many different view types. This was essentially resulting in too many WebContents instances being treated as tabs. Review URL: https://chromiumcodereview.appspot.com/10387110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/chrome_geolocation_permission_context.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index c9a3ff8..4d2465b 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