diff options
Diffstat (limited to 'content/public/browser')
26 files changed, 65 insertions, 60 deletions
diff --git a/content/public/browser/access_token_store.h b/content/public/browser/access_token_store.h index 0af3fe7..bd13014 100644 --- a/content/public/browser/access_token_store.h +++ b/content/public/browser/access_token_store.h @@ -33,7 +33,7 @@ namespace content { class AccessTokenStore : public base::RefCountedThreadSafe<AccessTokenStore> { public: // Map of server URLs to associated access token. - typedef std::map<GURL, string16> AccessTokenSet; + typedef std::map<GURL, base::string16> AccessTokenSet; typedef base::Callback<void(AccessTokenSet, net::URLRequestContextGetter*)> LoadAccessTokensCallbackType; @@ -47,7 +47,7 @@ class AccessTokenStore : public base::RefCountedThreadSafe<AccessTokenStore> { const LoadAccessTokensCallbackType& callback) = 0; virtual void SaveAccessToken( - const GURL& server_url, const string16& access_token) = 0; + const GURL& server_url, const base::string16& access_token) = 0; protected: friend class base::RefCountedThreadSafe<AccessTokenStore>; diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h index e618ad7..7776a0d 100644 --- a/content/public/browser/browser_child_process_host.h +++ b/content/public/browser/browser_child_process_host.h @@ -68,7 +68,7 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender { bool known_dead, int* exit_code) = 0; // Sets the user-visible name of the process. - virtual void SetName(const string16& name) = 0; + virtual void SetName(const base::string16& name) = 0; // Set the handle of the process. BrowserChildProcessHost will do this when // the Launch method is used to start the process. However if the owner diff --git a/content/public/browser/browser_plugin_guest_delegate.h b/content/public/browser/browser_plugin_guest_delegate.h index e8767e2..fd535df 100644 --- a/content/public/browser/browser_plugin_guest_delegate.h +++ b/content/public/browser/browser_plugin_guest_delegate.h @@ -26,9 +26,9 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate { // Add a message to the console. virtual void AddMessageToConsole(int32 level, - const string16& message, + const base::string16& message, int32 line_no, - const string16& source_id) {} + const base::string16& source_id) {} // Request the delegate to close this guest, and do whatever cleanup it needs // to do. diff --git a/content/public/browser/child_process_data.h b/content/public/browser/child_process_data.h index b669305..3683be9 100644 --- a/content/public/browser/child_process_data.h +++ b/content/public/browser/child_process_data.h @@ -18,7 +18,7 @@ struct ChildProcessData { // The name of the process. i.e. for plugins it might be Flash, while for // for workers it might be the domain that it's from. - string16 name; + base::string16 name; // The unique identifier for this child process. This identifier is NOT a // process ID, and will be unique for all types of child process for diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index f105cc9..b404a97 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -141,8 +141,8 @@ bool ContentBrowserClient::AllowSaveLocalState(ResourceContext* context) { bool ContentBrowserClient::AllowWorkerDatabase( const GURL& url, - const string16& name, - const string16& display_name, + const base::string16& name, + const base::string16& display_name, unsigned long estimated_size, ResourceContext* context, const std::vector<std::pair<int, int> >& render_views) { @@ -158,7 +158,7 @@ bool ContentBrowserClient::AllowWorkerFileSystem( bool ContentBrowserClient::AllowWorkerIndexedDB( const GURL& url, - const string16& name, + const base::string16& name, ResourceContext* context, const std::vector<std::pair<int, int> >& render_views) { return true; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index bd3dc81..aae30eb 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -314,8 +314,8 @@ class CONTENT_EXPORT ContentBrowserClient { // This is called on the IO thread. 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, ResourceContext* context, const std::vector<std::pair<int, int> >& render_views); @@ -333,7 +333,7 @@ class CONTENT_EXPORT ContentBrowserClient { // This is called on the IO thread. virtual bool AllowWorkerIndexedDB( const GURL& url, - const string16& name, + const base::string16& name, ResourceContext* context, const std::vector<std::pair<int, int> >& render_views); diff --git a/content/public/browser/download_save_info.h b/content/public/browser/download_save_info.h index 6b7a14a..1f44911 100644 --- a/content/public/browser/download_save_info.h +++ b/content/public/browser/download_save_info.h @@ -27,7 +27,7 @@ struct CONTENT_EXPORT DownloadSaveInfo { // If non-empty, contains an untrusted filename suggestion. This can't contain // a path (only a filename), and is only effective if |file_path| is empty. - string16 suggested_name; + base::string16 suggested_name; // If non-NULL, contains the source data stream for the file contents. scoped_ptr<net::FileStream> file_stream; diff --git a/content/public/browser/download_url_parameters.h b/content/public/browser/download_url_parameters.h index a907f09..b48bc2a 100644 --- a/content/public/browser/download_url_parameters.h +++ b/content/public/browser/download_url_parameters.h @@ -89,7 +89,7 @@ class CONTENT_EXPORT DownloadUrlParameters { void set_file_path(const base::FilePath& file_path) { save_info_.file_path = file_path; } - void set_suggested_name(const string16& suggested_name) { + void set_suggested_name(const base::string16& suggested_name) { save_info_.suggested_name = suggested_name; } void set_offset(int64 offset) { save_info_.offset = offset; } @@ -126,7 +126,9 @@ class CONTENT_EXPORT DownloadUrlParameters { return resource_context_; } const base::FilePath& file_path() const { return save_info_.file_path; } - const string16& suggested_name() const { return save_info_.suggested_name; } + const base::string16& suggested_name() const { + return save_info_.suggested_name; + } int64 offset() const { return save_info_.offset; } const std::string& hash_state() const { return save_info_.hash_state; } bool prompt() const { return save_info_.prompt_for_save_location; } diff --git a/content/public/browser/javascript_dialog_manager.cc b/content/public/browser/javascript_dialog_manager.cc index 0a58d9f..ccc1f16 100644 --- a/content/public/browser/javascript_dialog_manager.cc +++ b/content/public/browser/javascript_dialog_manager.cc @@ -9,7 +9,7 @@ namespace content { bool JavaScriptDialogManager::HandleJavaScriptDialog( WebContents* web_contents, bool accept, - const string16* prompt_override) { + const base::string16* prompt_override) { return false; } diff --git a/content/public/browser/javascript_dialog_manager.h b/content/public/browser/javascript_dialog_manager.h index 778893d..cdc628b 100644 --- a/content/public/browser/javascript_dialog_manager.h +++ b/content/public/browser/javascript_dialog_manager.h @@ -23,7 +23,7 @@ class WebContents; class CONTENT_EXPORT JavaScriptDialogManager { public: typedef base::Callback<void(bool /* success */, - const string16& /* user_input */)> + const base::string16& /* user_input */)> DialogClosedCallback; // Displays a JavaScript dialog. |did_suppress_message| will not be nil; if @@ -33,14 +33,14 @@ class CONTENT_EXPORT JavaScriptDialogManager { const GURL& origin_url, const std::string& accept_lang, JavaScriptMessageType javascript_message_type, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const DialogClosedCallback& callback, bool* did_suppress_message) = 0; // Displays a dialog asking the user if they want to leave a page. virtual void RunBeforeUnloadDialog(WebContents* web_contents, - const string16& message_text, + const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) = 0; @@ -50,7 +50,7 @@ class CONTENT_EXPORT JavaScriptDialogManager { // dialog was handled. virtual bool HandleJavaScriptDialog(WebContents* web_contents, bool accept, - const string16* prompt_override); + const base::string16* prompt_override); // Cancels all active and pending dialogs for the given WebContents. virtual void CancelActiveAndPendingDialogs(WebContents* web_contents) = 0; diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h index 1c7d343..e23773f 100644 --- a/content/public/browser/navigation_entry.h +++ b/content/public/browser/navigation_entry.h @@ -73,8 +73,8 @@ class NavigationEntry { // The caller is responsible for detecting when there is no title and // displaying the appropriate "Untitled" label if this is being displayed to // the user. - virtual void SetTitle(const string16& title) = 0; - virtual const string16& GetTitle() const = 0; + virtual void SetTitle(const base::string16& title) = 0; + virtual const base::string16& GetTitle() const = 0; // Page state is an opaque blob created by Blink that represents the state of // the page. This includes form entries and scroll position for each frame. @@ -99,7 +99,7 @@ class NavigationEntry { // the page if it is available or the URL. |languages| is the list of // accpeted languages (e.g., prefs::kAcceptLanguages) or empty if proper // URL formatting isn't needed (e.g., unit tests). - virtual const string16& GetTitleForDisplay( + virtual const base::string16& GetTitleForDisplay( const std::string& languages) const = 0; // Returns true if the current tab is in view source mode. This will be false @@ -192,9 +192,11 @@ class NavigationEntry { // Set extra data on this NavigationEntry according to the specified |key|. // This data is not persisted by default. - virtual void SetExtraData(const std::string& key, const string16& data) = 0; + virtual void SetExtraData(const std::string& key, + const base::string16& data) = 0; // If present, fills the |data| present at the specified |key|. - virtual bool GetExtraData(const std::string& key, string16* data) const = 0; + virtual bool GetExtraData(const std::string& key, + base::string16* data) const = 0; // Removes the data at the specified |key|. virtual void ClearExtraData(const std::string& key) = 0; diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h index 8c28948..76e6dda 100644 --- a/content/public/browser/plugin_service.h +++ b/content/public/browser/plugin_service.h @@ -89,7 +89,7 @@ class PluginService { // Returns the display name for the plugin identified by the given path. If // the path doesn't identify a plugin, or the plugin has no display name, // this will attempt to generate a display name from the path. - virtual string16 GetPluginDisplayNameByPath( + virtual base::string16 GetPluginDisplayNameByPath( const base::FilePath& plugin_path) = 0; // Asynchronously loads plugins if necessary and then calls back to the diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 2eed287..366ad0d 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -102,7 +102,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { int callback_context) = 0; virtual void DesktopNotificationPostDisplay(int callback_context) = 0; virtual void DesktopNotificationPostError(int notification_id, - const string16& message) = 0; + const base::string16& message) = 0; virtual void DesktopNotificationPostClose(int notification_id, bool by_user) = 0; virtual void DesktopNotificationPostClick(int notification_id) = 0; @@ -170,15 +170,15 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { const blink::WebMediaPlayerAction& action) = 0; // Runs some javascript within the context of a frame in the page. - virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath, - const string16& jscript) = 0; + virtual void ExecuteJavascriptInWebFrame(const base::string16& frame_xpath, + const base::string16& jscript) = 0; // Runs some javascript within the context of a frame in the page. The result // is sent back via the provided callback. typedef base::Callback<void(const base::Value*)> JavascriptResultCallback; virtual void ExecuteJavascriptInWebFrameCallbackResult( - const string16& frame_xpath, - const string16& jscript, + const base::string16& frame_xpath, + const base::string16& jscript, const JavascriptResultCallback& callback) = 0; // Tells the renderer to perform the given action on the plugin located at @@ -190,7 +190,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { virtual void ExitFullscreen() = 0; // Finds text on a page. - virtual void Find(int request_id, const string16& search_text, + virtual void Find(int request_id, const base::string16& search_text, const blink::WebFindOptions& options) = 0; // Notifies the renderer that the user has closed the FindInPage window @@ -223,7 +223,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { // Requests the renderer to evaluate an xpath to a frame and insert css // into that frame's document. - virtual void InsertCSS(const string16& frame_xpath, + virtual void InsertCSS(const base::string16& frame_xpath, const std::string& css) = 0; // Returns true if the RenderView is active and has not crashed. Virtual diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 25fa41e..944ecbb 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -256,11 +256,11 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender { // Makes an IPC call to tell webkit to replace the currently selected word // or a word around the cursor. - virtual void Replace(const string16& word) = 0; + virtual void Replace(const base::string16& word) = 0; // Makes an IPC call to tell webkit to replace the misspelling in the current // selection. - virtual void ReplaceMisspelling(const string16& word) = 0; + virtual void ReplaceMisspelling(const base::string16& word) = 0; // Called to notify the RenderWidget that the resize rect has changed without // the size of the RenderWidget itself changing. diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h index 6caba6d..d815cdf 100644 --- a/content/public/browser/render_widget_host_view.h +++ b/content/public/browser/render_widget_host_view.h @@ -105,7 +105,7 @@ class CONTENT_EXPORT RenderWidgetHostView { virtual void SetShowingContextMenu(bool showing) = 0; // Returns the currently selected text. - virtual string16 GetSelectedText() const = 0; + virtual base::string16 GetSelectedText() const = 0; // Subclasses should override this method to do what is appropriate to set // the custom background for their platform. diff --git a/content/public/browser/speech_recognition_manager.h b/content/public/browser/speech_recognition_manager.h index c6dacea..f6a76a2 100644 --- a/content/public/browser/speech_recognition_manager.h +++ b/content/public/browser/speech_recognition_manager.h @@ -80,7 +80,7 @@ class SpeechRecognitionManager { // Returns a human readable string for the model/make of the active audio // input device for this computer. - virtual string16 GetAudioInputDeviceModel() = 0; + virtual base::string16 GetAudioInputDeviceModel() = 0; // Invokes the platform provided microphone settings UI in a non-blocking way, // via the BrowserThread::FILE thread. diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 070966e..9bb2c83 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -222,7 +222,7 @@ class WebContents : public PageNavigator, // Returns the current navigation properties, which if a navigation is // pending may be provisional (e.g., the navigation could result in a // download, in which case the URL would revert to what it was previously). - virtual const string16& GetTitle() const = 0; + virtual const base::string16& GetTitle() const = 0; // The max page ID for any page that the current SiteInstance has loaded in // this WebContents. Page IDs are specific to a given SiteInstance and @@ -250,7 +250,7 @@ class WebContents : public PageNavigator, // Return the current load state and the URL associated with it. virtual const net::LoadStateWithParam& GetLoadState() const = 0; - virtual const string16& GetLoadStateHost() const = 0; + virtual const base::string16& GetLoadStateHost() const = 0; // Return the upload progress. virtual uint64 GetUploadSize() const = 0; diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index f9e4951..63ad65b 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -41,9 +41,9 @@ bool WebContentsDelegate::ShouldSuppressDialogs() { bool WebContentsDelegate::AddMessageToConsole(WebContents* source, int32 level, - const string16& message, + const base::string16& message, int32 line_no, - const string16& source_id) { + const base::string16& source_id) { return false; } @@ -125,7 +125,7 @@ bool WebContentsDelegate::ShouldCreateWebContents( 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) { diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index 18bd9ef..81faa6b 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 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index 5c7c935..469c9e5 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -126,7 +126,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, // this signal without a prior DidStartProvisionalLoadForFrame signal. 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, @@ -134,11 +134,11 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, // This method is invoked when the provisional load failed. 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) {} // If the provisional load corresponded to the main frame, this method is @@ -184,7 +184,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, const GURL& validated_url, bool is_main_frame, int error_code, - const string16& error_description, + const base::string16& error_description, RenderViewHost* render_view_host) {} // This method is invoked when content was loaded from an in-memory cache. diff --git a/content/public/browser/web_drag_dest_delegate.h b/content/public/browser/web_drag_dest_delegate.h index cca3d2e..a556b88 100644 --- a/content/public/browser/web_drag_dest_delegate.h +++ b/content/public/browser/web_drag_dest_delegate.h @@ -55,7 +55,7 @@ class WebDragDestDelegate { // drag. Not every drag will trigger these. virtual void OnReceiveDataFromGtk(GtkSelectionData* data) = 0; virtual void OnReceiveProcessedData(const GURL& url, - const string16& title) = 0; + const base::string16& title) = 0; #elif defined(USE_AURA) // Called at the start of every drag to supply the data associated with the // drag. diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h index 3dad85c..5427673 100644 --- a/content/public/browser/web_ui.h +++ b/content/public/browser/web_ui.h @@ -41,7 +41,7 @@ class CONTENT_EXPORT WebUI { // Returns JavaScript code that, when executed, calls the function specified // by |function_name| with the arguments specified in |arg_list|. - static string16 GetJavascriptCall( + static base::string16 GetJavascriptCall( const std::string& function_name, const std::vector<const base::Value*>& arg_list); @@ -60,8 +60,8 @@ class CONTENT_EXPORT WebUI { // Gets a custom tab title provided by the Web UI. If there is no title // override, the string will be empty which should trigger the default title // behavior for the tab. - virtual const string16& GetOverriddenTitle() const = 0; - virtual void OverrideTitle(const string16& title) = 0; + virtual const base::string16& GetOverriddenTitle() const = 0; + virtual void OverrideTitle(const base::string16& title) = 0; // Returns the transition type that should be used for link clicks on this // Web UI. This will default to LINK but may be overridden. diff --git a/content/public/browser/web_ui_data_source.h b/content/public/browser/web_ui_data_source.h index 8348de3..b5cc6d5 100644 --- a/content/public/browser/web_ui_data_source.h +++ b/content/public/browser/web_ui_data_source.h @@ -30,7 +30,8 @@ class WebUIDataSource { WebUIDataSource* source); // Adds a string keyed to its name to our dictionary. - virtual void AddString(const std::string& name, const string16& value) = 0; + virtual void AddString(const std::string& name, + const base::string16& value) = 0; // Adds a string keyed to its name to our dictionary. virtual void AddString(const std::string& name, const std::string& value) = 0; diff --git a/content/public/browser/web_ui_message_handler.h b/content/public/browser/web_ui_message_handler.h index 18fdd94..20a6072 100644 --- a/content/public/browser/web_ui_message_handler.h +++ b/content/public/browser/web_ui_message_handler.h @@ -46,7 +46,7 @@ class CONTENT_EXPORT WebUIMessageHandler { double* out_value); // Extract a string value from a list Value. - static string16 ExtractStringValue(const base::ListValue* value); + static base::string16 ExtractStringValue(const base::ListValue* value); // This is where subclasses specify which messages they'd like to handle and // perform any additional initialization.. At this point web_ui() will return diff --git a/content/public/browser/worker_service.h b/content/public/browser/worker_service.h index 10740fa..7ce2bf4 100644 --- a/content/public/browser/worker_service.h +++ b/content/public/browser/worker_service.h @@ -31,7 +31,7 @@ class WorkerService { struct WorkerInfo { GURL url; - string16 name; + base::string16 name; int process_id; int route_id; base::ProcessHandle handle; diff --git a/content/public/browser/worker_service_observer.h b/content/public/browser/worker_service_observer.h index ff6c8ef..9c1e055 100644 --- a/content/public/browser/worker_service_observer.h +++ b/content/public/browser/worker_service_observer.h @@ -15,7 +15,7 @@ namespace content { class WorkerServiceObserver { public: virtual void WorkerCreated(const GURL& url, - const string16& name, + const base::string16& name, int process_id, int route_id) {} virtual void WorkerDestroyed(int process_id, int route_id) {} |