chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm - 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/cocoa/omnibox/omnibox_view_mac.mm

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/cocoa/omnibox/omnibox_view_mac.h ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

index 68cf08801908b9cac716b7767a7fc70405aed54e..621ee6e2275182c6d0281f69b4cb90629d4a8b6c 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

@@ -7,6 +7,7 @@

#include <Carbon/Carbon.h> // kVK_Return

#include "base/mac/foundation_util.h"

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

#include "base/metrics/histogram.h"

#include "base/strings/string_util.h"

#include "base/strings/sys_string_conversions.h"

@@ -15,9 +16,9 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/search/search.h"

#include "chrome/browser/themes/theme_service.h"

+#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"

#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"

-#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"

#include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"

#include "chrome/browser/ui/omnibox/clipboard_utils.h"

@@ -173,7 +174,7 @@ OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,

AutocompleteTextField* field)

: OmniboxView(

controller,

- make_scoped_ptr(new ChromeOmniboxClient(controller, profile))),

+ base::WrapUnique(new ChromeOmniboxClient(controller, profile))),

profile_(profile),

popup_view_(new OmniboxPopupViewMac(this, model(), field)),

field_(field),

« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm » ('j') | no next file with comments »