| Index: chrome/browser/captive_portal/captive_portal_tab_helper.h
|
| diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h
|
| index 5e0a989df31bf57a8631a0c9754370eff96b79ad..c2abe570d7db84e1e01e04cae0282ee93d1cfe58 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_tab_helper.h
|
| +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h
|
| @@ -79,7 +79,7 @@ class CaptivePortalTabHelper
|
|
|
| virtual void DidCommitProvisionalLoadForFrame(
|
| int64 frame_id,
|
| - const string16& frame_unique_name,
|
| + const base::string16& frame_unique_name,
|
| bool is_main_frame,
|
| const GURL& url,
|
| content::PageTransition transition_type,
|
| @@ -87,11 +87,11 @@ class CaptivePortalTabHelper
|
|
|
| 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,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
|
|
| virtual void DidStopLoading(
|
|
|