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

Side by Side Diff: chrome/browser/ui/views/bar_control_button.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_BAR_CONTROL_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
7 7
8 #include <memory>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/views/controls/button/image_button.h" 12 #include "ui/views/controls/button/image_button.h"
12 13
13 namespace gfx { 14 namespace gfx {
14 enum class VectorIconId; 15 enum class VectorIconId;
15 } 16 }
16 17
17 namespace views { 18 namespace views {
18 class InkDropDelegate; 19 class InkDropDelegate;
19 } 20 }
20 21
(...skipping 11 matching lines...) Expand all
32 33
33 // views::ImageButton: 34 // views::ImageButton:
34 void OnThemeChanged() override; 35 void OnThemeChanged() override;
35 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 36 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
36 37
37 private: 38 private:
38 gfx::VectorIconId id_; 39 gfx::VectorIconId id_;
39 base::Callback<SkColor(void)> get_text_color_callback_; 40 base::Callback<SkColor(void)> get_text_color_callback_;
40 41
41 // Controls the visual feedback for the button state. 42 // Controls the visual feedback for the button state.
42 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 43 std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_;
43 44
44 DISALLOW_COPY_AND_ASSIGN(BarControlButton); 45 DISALLOW_COPY_AND_ASSIGN(BarControlButton);
45 }; 46 };
46 47
47 #endif // CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_ 48 #endif // CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autofill/tooltip_icon.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698