diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-26 01:20:50 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-26 01:20:50 +0000 |
| commit | 9ca50c9f36065f24fb1e39dbbf6f09b52eac285e (patch) | |
| tree | c306a0b7dfdad51cf66664200212950ffb09e1c9 /chrome/browser/geolocation | |
| parent | 3227d8f20eddeb9e305f74304e8b3a72b21df128 (diff) | |
| download | chromium_src-9ca50c9f36065f24fb1e39dbbf6f09b52eac285e.zip chromium_src-9ca50c9f36065f24fb1e39dbbf6f09b52eac285e.tar.gz chromium_src-9ca50c9f36065f24fb1e39dbbf6f09b52eac285e.tar.bz2 | |
Revert 266297 "1. Handle the case of empty embedder_extension_id..."
This change introduces static initializers (the two
static const std::string Type constants).
Static strings should be declared as char * instead.
> 1. Handle the case of empty embedder_extension_id in guestview.h.
>
> 2. Introduce a template class GuestView<T> to handle the *guestview-specific functions in guestview.h:
> . Rename GuestView to GuestViewBase, introduce GuestView<T> class, and move *ViewGuest-specific functions to GuestView<T>:
> -- FromWebContents<T>(...)
> -- From<T>(...).
> . Introduce a template member function As() in GuestViewBase to replace all of the As*View functions.
>
> 3. In each derived *ViewGuest class , e.g., WebViewGuest & AdViewGuest, define a static variable to show its view type (string).
>
>
> BUG=351824
>
> Review URL: https://codereview.chromium.org/237533008
TBR=hanxi@chromium.org
Review URL: https://codereview.chromium.org/252773003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266313 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 f5507c7..7364754 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/guest_view/web_view/web_view_guest.h" +#include "chrome/browser/guestview/webview/webview_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" |