diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 12:29:59 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 12:29:59 +0000 |
| commit | 945604a562be79e66de3d247fe2eaaa06dc4f777 (patch) | |
| tree | dcc1f54292767ce88714986a55cffa274d96e98e /chrome/browser/geolocation | |
| parent | 9821db093663c9660e62b457b39780ce49cb0975 (diff) | |
| download | chromium_src-945604a562be79e66de3d247fe2eaaa06dc4f777.zip chromium_src-945604a562be79e66de3d247fe2eaaa06dc4f777.tar.gz chromium_src-945604a562be79e66de3d247fe2eaaa06dc4f777.tar.bz2 | |
Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id...""
Retry r266297 with static initializer fix.
This reverts commit 9ca50c9f36065f24fb1e39dbbf6f09b52eac285e.
BUG=351824
TBR=rmsousa@chromium.org
Review URL: https://codereview.chromium.org/259943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/chrome_geolocation_permission_context.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 7364754..f5507c7 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -15,7 +15,7 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/extensions/suggest_permission_util.h" -#include "chrome/browser/guestview/webview/webview_guest.h" +#include "chrome/browser/guest_view/web_view/web_view_guest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |