diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 05:31:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 05:31:15 +0000 |
| commit | 299d7f1d0003d467a159fb79ba1884080a655a00 (patch) | |
| tree | 087f5e337119e9c836260bf46cfd808236157d30 /chrome/browser/geolocation | |
| parent | de030d16f66334efafdef4ddd01f715d9ebbcfe9 (diff) | |
| download | chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.zip chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.tar.gz chromium_src-299d7f1d0003d467a159fb79ba1884080a655a00.tar.bz2 | |
Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum value in the WebContents' property bag.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10409088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/chrome_geolocation_permission_context.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 7d61875..53d0b2f 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -21,8 +21,8 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/view_type_utils.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,8 +624,7 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission( WebContents* web_contents = tab_util::GetWebContentsByID(render_process_id, render_view_id); - if (!web_contents || web_contents->GetViewType() != - chrome::VIEW_TYPE_TAB_CONTENTS) { + if (chrome::GetViewType(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 |