| Index: android_webview/browser/aw_content_browser_client.h
|
| diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
|
| index 3f81eca9e1a371d880e15ce060a78732c705a64b..cc32a60c0925dbfb83533803e7843f880a4548cf 100644
|
| --- a/android_webview/browser/aw_content_browser_client.h
|
| +++ b/android_webview/browser/aw_content_browser_client.h
|
| @@ -76,8 +76,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
|
| net::CookieOptions* options) OVERRIDE;
|
| virtual bool AllowWorkerDatabase(
|
| const GURL& url,
|
| - const string16& name,
|
| - const string16& display_name,
|
| + const base::string16& name,
|
| + const base::string16& display_name,
|
| unsigned long estimated_size,
|
| content::ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
|
| @@ -87,7 +87,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
|
| const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
|
| virtual bool AllowWorkerIndexedDB(
|
| const GURL& url,
|
| - const string16& name,
|
| + const base::string16& name,
|
| content::ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
|
| virtual content::QuotaPermissionContext*
|
|
|