| Index: content/browser/web_contents/web_contents_impl.h
|
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
| index 75eb253259897225c60c7184b24abd0e17336b15..a1e6bbb111bb975e0b3cc8e469bca6ae0518bc52 100644
|
| --- a/content/browser/web_contents/web_contents_impl.h
|
| +++ b/content/browser/web_contents/web_contents_impl.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include <functional>
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| @@ -16,7 +17,6 @@
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/process/process.h"
|
| #include "base/values.h"
|
| @@ -442,7 +442,8 @@ class CONTENT_EXPORT WebContentsImpl
|
| RenderFrameHost* target_rfh,
|
| SiteInstance* source_site_instance) const override;
|
| void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
|
| - scoped_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(const GURL& url) override;
|
| + std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
|
| + const GURL& url) override;
|
|
|
| // RenderViewHostDelegate ----------------------------------------------------
|
| RenderViewHostDelegateView* GetDelegateView() override;
|
| @@ -1046,7 +1047,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| NavigationControllerImpl controller_;
|
|
|
| // The corresponding view.
|
| - scoped_ptr<WebContentsView> view_;
|
| + std::unique_ptr<WebContentsView> view_;
|
|
|
| // The view of the RVHD. Usually this is our WebContentsView implementation,
|
| // but if an embedder uses a different WebContentsView, they'll need to
|
| @@ -1083,7 +1084,7 @@ class CONTENT_EXPORT WebContentsImpl
|
|
|
| // If this WebContents is part of a "tree of WebContents", then this contains
|
| // information about the structure.
|
| - scoped_ptr<WebContentsTreeNode> node_;
|
| + std::unique_ptr<WebContentsTreeNode> node_;
|
|
|
| // SavePackage, lazily created.
|
| scoped_refptr<SavePackage> save_package_;
|
| @@ -1217,7 +1218,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| #if defined(OS_ANDROID)
|
| // Date time chooser opened by this tab.
|
| // Only used in Android since all other platforms use a multi field UI.
|
| - scoped_ptr<DateTimeChooserAndroid> date_time_chooser_;
|
| + std::unique_ptr<DateTimeChooserAndroid> date_time_chooser_;
|
| #endif
|
|
|
| // Holds information about a current color chooser dialog, if one is visible.
|
| @@ -1232,7 +1233,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| int render_frame_id;
|
|
|
| // Color chooser that was opened by this tab.
|
| - scoped_ptr<ColorChooser> chooser;
|
| + std::unique_ptr<ColorChooser> chooser;
|
|
|
| // A unique identifier for the current color chooser. Identifiers are
|
| // unique across a renderer process. This avoids race conditions in
|
| @@ -1244,18 +1245,19 @@ class CONTENT_EXPORT WebContentsImpl
|
| int identifier;
|
| };
|
|
|
| - scoped_ptr<ColorChooserInfo> color_chooser_info_;
|
| + std::unique_ptr<ColorChooserInfo> color_chooser_info_;
|
|
|
| // Manages the embedder state for browser plugins, if this WebContents is an
|
| // embedder; NULL otherwise.
|
| - scoped_ptr<BrowserPluginEmbedder> browser_plugin_embedder_;
|
| + std::unique_ptr<BrowserPluginEmbedder> browser_plugin_embedder_;
|
| // Manages the guest state for browser plugin, if this WebContents is a guest;
|
| // NULL otherwise.
|
| - scoped_ptr<BrowserPluginGuest> browser_plugin_guest_;
|
| + std::unique_ptr<BrowserPluginGuest> browser_plugin_guest_;
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| // Manages the whitelist of plugin content origins exempt from power saving.
|
| - scoped_ptr<PluginContentOriginWhitelist> plugin_content_origin_whitelist_;
|
| + std::unique_ptr<PluginContentOriginWhitelist>
|
| + plugin_content_origin_whitelist_;
|
| #endif
|
|
|
| // This must be at the end, or else we might get notifications and use other
|
| @@ -1287,7 +1289,7 @@ class CONTENT_EXPORT WebContentsImpl
|
|
|
| // When a new tab is created asynchronously, stores the OpenURLParams needed
|
| // to continue loading the page once the tab is ready.
|
| - scoped_ptr<OpenURLParams> delayed_open_url_params_;
|
| + std::unique_ptr<OpenURLParams> delayed_open_url_params_;
|
|
|
| // Whether overscroll should be unconditionally disabled.
|
| bool force_disable_overscroll_content_;
|
| @@ -1295,14 +1297,14 @@ class CONTENT_EXPORT WebContentsImpl
|
| // Whether the last JavaScript dialog shown was suppressed. Used for testing.
|
| bool last_dialog_suppressed_;
|
|
|
| - scoped_ptr<GeolocationServiceContext> geolocation_service_context_;
|
| + std::unique_ptr<GeolocationServiceContext> geolocation_service_context_;
|
|
|
| - scoped_ptr<WakeLockServiceContext> wake_lock_service_context_;
|
| + std::unique_ptr<WakeLockServiceContext> wake_lock_service_context_;
|
|
|
| - scoped_ptr<ScreenOrientationDispatcherHost>
|
| + std::unique_ptr<ScreenOrientationDispatcherHost>
|
| screen_orientation_dispatcher_host_;
|
|
|
| - scoped_ptr<ManifestManagerHost> manifest_manager_host_;
|
| + std::unique_ptr<ManifestManagerHost> manifest_manager_host_;
|
|
|
| // The accessibility mode for all frames. This is queried when each frame
|
| // is created, and broadcast to all frames when it changes.
|
| @@ -1312,19 +1314,19 @@ class CONTENT_EXPORT WebContentsImpl
|
| AudioStreamMonitor audio_stream_monitor_;
|
|
|
| // Created on-demand to mute all audio output from this WebContents.
|
| - scoped_ptr<WebContentsAudioMuter> audio_muter_;
|
| + std::unique_ptr<WebContentsAudioMuter> audio_muter_;
|
|
|
| size_t bluetooth_connected_device_count_;
|
|
|
| bool virtual_keyboard_requested_;
|
|
|
| // Notifies ResourceDispatcherHostImpl of various events related to loading.
|
| - scoped_ptr<LoaderIOThreadNotifier> loader_io_thread_notifier_;
|
| + std::unique_ptr<LoaderIOThreadNotifier> loader_io_thread_notifier_;
|
|
|
| // Manages media players, CDMs, and power save blockers for media.
|
| - scoped_ptr<MediaWebContentsObserver> media_web_contents_observer_;
|
| + std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_;
|
|
|
| - scoped_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
|
| + std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
|
|
|
| PageImportanceSignals page_importance_signals_;
|
|
|
| @@ -1335,7 +1337,7 @@ class CONTENT_EXPORT WebContentsImpl
|
|
|
| // A copy of the text input state from |view_with_active_text_input_| when
|
| // there exists one, or empty (type == ui::TEXT_INPUT_TYPE_NONE) if otherwise.
|
| - scoped_ptr<TextInputState> text_input_state_;
|
| + std::unique_ptr<TextInputState> text_input_state_;
|
|
|
| base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
|
| base::WeakPtrFactory<WebContentsImpl> weak_factory_;
|
|
|