| Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
|
| ===================================================================
|
| --- chrome/browser/geolocation/chrome_geolocation_permission_context.cc (revision 191609)
|
| +++ chrome/browser/geolocation/chrome_geolocation_permission_context.cc (working copy)
|
| @@ -19,11 +19,11 @@
|
| #include "chrome/browser/geolocation/geolocation_permission_request_id.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/tab_contents/tab_util.h"
|
| -#include "chrome/browser/view_type_utils.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "extensions/browser/view_type_utils.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
|
|
|
| @@ -86,7 +86,8 @@
|
| }
|
| }
|
|
|
| - if (chrome::GetViewType(web_contents) != chrome::VIEW_TYPE_TAB_CONTENTS) {
|
| + if (extensions::GetViewType(web_contents) !=
|
| + extensions::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 (web_contents will have a different ViewType). But why do
|
|
|