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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <set> 11 #include <set>
11 #include <string> 12 #include <string>
12 13
13 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "components/omnibox/browser/omnibox_view.h" 18 #include "components/omnibox/browser/omnibox_view.h"
19 #include "components/security_state/security_state_model.h" 19 #include "components/security_state/security_state_model.h"
20 #include "ui/base/window_open_disposition.h" 20 #include "ui/base/window_open_disposition.h"
21 #include "ui/gfx/range/range.h" 21 #include "ui/gfx/range/range.h"
22 #include "ui/views/controls/textfield/textfield.h" 22 #include "ui/views/controls/textfield/textfield.h"
23 #include "ui/views/controls/textfield/textfield_controller.h" 23 #include "ui/views/controls/textfield/textfield_controller.h"
24 24
25 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 std::set<ui::Clipboard::FormatType>* format_types) override; 204 std::set<ui::Clipboard::FormatType>* format_types) override;
205 int OnDrop(const ui::OSExchangeData& data) override; 205 int OnDrop(const ui::OSExchangeData& data) override;
206 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override; 206 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override;
207 207
208 Profile* profile_; 208 Profile* profile_;
209 209
210 // When true, the location bar view is read only and also is has a slightly 210 // When true, the location bar view is read only and also is has a slightly
211 // different presentation (smaller font size). This is used for popups. 211 // different presentation (smaller font size). This is used for popups.
212 bool popup_window_mode_; 212 bool popup_window_mode_;
213 213
214 scoped_ptr<OmniboxPopupView> popup_view_; 214 std::unique_ptr<OmniboxPopupView> popup_view_;
215 215
216 security_state::SecurityStateModel::SecurityLevel security_level_; 216 security_state::SecurityStateModel::SecurityLevel security_level_;
217 217
218 // Selection persisted across temporary text changes, like popup suggestions. 218 // Selection persisted across temporary text changes, like popup suggestions.
219 gfx::Range saved_temporary_selection_; 219 gfx::Range saved_temporary_selection_;
220 220
221 // Holds the user's selection across focus changes. There is only a saved 221 // Holds the user's selection across focus changes. There is only a saved
222 // selection if this range IsValid(). 222 // selection if this range IsValid().
223 gfx::Range saved_selection_for_focus_change_; 223 gfx::Range saved_selection_for_focus_change_;
224 224
(...skipping 28 matching lines...) Expand all
253 // painted. Used to measure omnibox responsiveness with a histogram. 253 // painted. Used to measure omnibox responsiveness with a histogram.
254 base::TimeTicks insert_char_time_; 254 base::TimeTicks insert_char_time_;
255 255
256 // Used to bind callback functions to this object. 256 // Used to bind callback functions to this object.
257 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_; 257 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_;
258 258
259 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 259 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
260 }; 260 };
261 261
262 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 262 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698