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

Side by Side Diff: chrome/browser/ui/views/find_bar_view.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_FIND_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
12 #include "chrome/browser/ui/views/dropdown_bar_view.h" 13 #include "chrome/browser/ui/views/dropdown_bar_view.h"
13 #include "ui/views/controls/button/button.h" 14 #include "ui/views/controls/button/button.h"
14 #include "ui/views/controls/textfield/textfield.h" 15 #include "ui/views/controls/textfield/textfield.h"
15 #include "ui/views/controls/textfield/textfield_controller.h" 16 #include "ui/views/controls/textfield/textfield_controller.h"
16 #include "ui/views/view_targeter_delegate.h" 17 #include "ui/views/view_targeter_delegate.h"
17 18
18 class FindBarHost; 19 class FindBarHost;
19 class FindNotificationDetails; 20 class FindNotificationDetails;
20 21
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Returns the OS-specific view for the find bar that acts as an intermediary 126 // Returns the OS-specific view for the find bar that acts as an intermediary
126 // between us and the WebContentsView. 127 // between us and the WebContentsView.
127 FindBarHost* find_bar_host() const; 128 FindBarHost* find_bar_host() const;
128 129
129 // Used to detect if the input text, not including the IME composition text, 130 // Used to detect if the input text, not including the IME composition text,
130 // has changed or not. 131 // has changed or not.
131 base::string16 last_searched_text_; 132 base::string16 last_searched_text_;
132 133
133 // The controls in the window. 134 // The controls in the window.
134 views::Textfield* find_text_; 135 views::Textfield* find_text_;
135 scoped_ptr<views::Painter> find_text_border_; 136 std::unique_ptr<views::Painter> find_text_border_;
136 views::Label* match_count_text_; 137 views::Label* match_count_text_;
137 views::View* focus_forwarder_view_; 138 views::View* focus_forwarder_view_;
138 views::Separator* separator_; 139 views::Separator* separator_;
139 views::ImageButton* find_previous_button_; 140 views::ImageButton* find_previous_button_;
140 views::ImageButton* find_next_button_; 141 views::ImageButton* find_next_button_;
141 views::ImageButton* close_button_; 142 views::ImageButton* close_button_;
142 143
143 // The preferred height of the find bar. 144 // The preferred height of the find bar.
144 int preferred_height_; 145 int preferred_height_;
145 146
146 DISALLOW_COPY_AND_ASSIGN(FindBarView); 147 DISALLOW_COPY_AND_ASSIGN(FindBarView);
147 }; 148 };
148 149
149 #endif // CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_ 150 #endif // CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_protocol_dialog.cc ('k') | chrome/browser/ui/views/find_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698