Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2474)

Unified Diff: content/shell/browser/shell.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index 6f11a727021776d08d023aadb0038155259ac328..547f3389830048756418dc5c6f6289549c3ff83c 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -6,10 +6,10 @@
#include <stdint.h>
+#include <memory>
#include <vector>
#include "base/callback_forward.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "build/build_config.h"
#include "content/public/browser/web_contents_delegate.h"
@@ -142,7 +142,7 @@ class Shell : public WebContentsDelegate,
void DidNavigateMainFramePostCommit(WebContents* web_contents) override;
JavaScriptDialogManager* GetJavaScriptDialogManager(
WebContents* source) override;
- scoped_ptr<BluetoothChooser> RunBluetoothChooser(
+ std::unique_ptr<BluetoothChooser> RunBluetoothChooser(
RenderFrameHost* frame,
const BluetoothChooser::EventHandler& event_handler) override;
#if defined(OS_MACOSX)
@@ -228,11 +228,11 @@ class Shell : public WebContentsDelegate,
void InnerShowDevTools();
void OnDevToolsWebContentsDestroyed();
- scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
+ std::unique_ptr<ShellJavaScriptDialogManager> dialog_manager_;
- scoped_ptr<WebContents> web_contents_;
+ std::unique_ptr<WebContents> web_contents_;
- scoped_ptr<DevToolsWebContentsObserver> devtools_observer_;
+ std::unique_ptr<DevToolsWebContentsObserver> devtools_observer_;
ShellDevToolsFrontend* devtools_frontend_;
bool is_fullscreen_;
« no previous file with comments | « content/shell/browser/layout_test/layout_test_url_request_context_getter.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698