| Index: content/public/browser/web_contents_delegate.h
|
| diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
|
| index 18bd9ef869d00168d170576c58c81cbb2d34e588..81faa6bf90a4b75523215dbbe63692ff531c8b19 100644
|
| --- a/content/public/browser/web_contents_delegate.h
|
| +++ b/content/public/browser/web_contents_delegate.h
|
| @@ -182,9 +182,9 @@ class CONTENT_EXPORT WebContentsDelegate {
|
| // will be used for the message.
|
| virtual bool AddMessageToConsole(WebContents* source,
|
| int32 level,
|
| - const string16& message,
|
| + const base::string16& message,
|
| int32 line_no,
|
| - const string16& source_id);
|
| + const base::string16& source_id);
|
|
|
| // Tells us that we've finished firing this tab's beforeunload event.
|
| // The proceed bool tells us whether the user chose to proceed closing the
|
| @@ -298,7 +298,7 @@ class CONTENT_EXPORT WebContentsDelegate {
|
| WebContents* web_contents,
|
| int route_id,
|
| WindowContainerType window_container_type,
|
| - const string16& frame_name,
|
| + const base::string16& frame_name,
|
| const GURL& target_url,
|
| const std::string& partition_id,
|
| SessionStorageNamespace* session_storage_namespace);
|
| @@ -307,7 +307,7 @@ class CONTENT_EXPORT WebContentsDelegate {
|
| // typically happens when popups are created.
|
| virtual void WebContentsCreated(WebContents* source_contents,
|
| int64 source_frame_id,
|
| - const string16& frame_name,
|
| + const base::string16& frame_name,
|
| const GURL& target_url,
|
| WebContents* new_contents) {}
|
|
|
| @@ -371,7 +371,7 @@ class CONTENT_EXPORT WebContentsDelegate {
|
| virtual void RegisterProtocolHandler(WebContents* web_contents,
|
| const std::string& protocol,
|
| const GURL& url,
|
| - const string16& title,
|
| + const base::string16& title,
|
| bool user_gesture) {}
|
|
|
| // Result of string search in the page. This includes the number of matches
|
|
|