chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h ('k') | chrome/browser/ui/webui/options/autofill_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

index 99921ab0dd631e9a5b048b4594bce31f5c7be1ad..cc8e1b1a334768698b7ede367efbf20c89e667bc 100644

--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

@@ -5,11 +5,13 @@

#include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h"

#include <stddef.h>

#include <string>

#include <utility>

#include "base/auto_reset.h"

#include "base/bind.h"

+#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

@@ -208,6 +210,6 @@ void OmniboxUIHandler::StartOmniboxQuery(const mojo::String& input_string,

void OmniboxUIHandler::ResetController() {

controller_.reset(new AutocompleteController(

- make_scoped_ptr(new ChromeAutocompleteProviderClient(profile_)), this,

+ base::WrapUnique(new ChromeAutocompleteProviderClient(profile_)), this,

AutocompleteClassifier::kDefaultOmniboxProviders));

}