| Index: content/browser/android/web_contents_observer_android.h
|
| diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h
|
| index 9742d2827ea34bae542058500945aab992808239..15a136390f84a54a68da3123777fa0b7675b1945 100644
|
| --- a/content/browser/android/web_contents_observer_android.h
|
| +++ b/content/browser/android/web_contents_observer_android.h
|
| @@ -38,17 +38,17 @@ class WebContentsObserverAndroid : public WebContentsObserver {
|
| virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidFailProvisionalLoad(
|
| int64 frame_id,
|
| - const string16& frame_unique_name,
|
| + const base::string16& frame_unique_name,
|
| bool is_main_frame,
|
| const GURL& validated_url,
|
| int error_code,
|
| - const string16& error_description,
|
| + const base::string16& error_description,
|
| RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidFailLoad(int64 frame_id,
|
| const GURL& validated_url,
|
| bool is_main_frame,
|
| int error_code,
|
| - const string16& error_description,
|
| + const base::string16& error_description,
|
| RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidNavigateMainFrame(const LoadCommittedDetails& details,
|
| const FrameNavigateParams& params) OVERRIDE;
|
| @@ -64,7 +64,7 @@ class WebContentsObserverAndroid : public WebContentsObserver {
|
| RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidCommitProvisionalLoadForFrame(
|
| int64 frame_id,
|
| - const string16& frame_unique_name,
|
| + const base::string16& frame_unique_name,
|
| bool is_main_frame,
|
| const GURL& url,
|
| PageTransition transition_type,
|
| @@ -83,7 +83,7 @@ class WebContentsObserverAndroid : public WebContentsObserver {
|
| void DidFailLoadInternal(bool is_provisional_load,
|
| bool is_main_frame,
|
| int error_code,
|
| - const string16& description,
|
| + const base::string16& description,
|
| const GURL& url);
|
|
|
| JavaObjectWeakGlobalRef weak_java_observer_;
|
|
|