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

Side by Side Diff: chrome/browser/ui/views/website_settings/chosen_object_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 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_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 9 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
11 #include "chrome/grit/theme_resources.h" 11 #include "chrome/grit/theme_resources.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/views/controls/button/button.h" 13 #include "ui/views/controls/button/button.h"
14 #include "ui/views/view.h" 14 #include "ui/views/view.h"
15 15
16 namespace views { 16 namespace views {
17 class ImageButton; 17 class ImageButton;
18 class ImageView; 18 class ImageView;
19 } 19 }
20 20
21 class ChosenObjectViewObserver; 21 class ChosenObjectViewObserver;
22 22
23 class ChosenObjectView : public views::View, public views::ButtonListener { 23 class ChosenObjectView : public views::View, public views::ButtonListener {
24 public: 24 public:
25 explicit ChosenObjectView( 25 explicit ChosenObjectView(
26 scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo> info); 26 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info);
27 27
28 void AddObserver(ChosenObjectViewObserver* observer); 28 void AddObserver(ChosenObjectViewObserver* observer);
29 29
30 private: 30 private:
31 ~ChosenObjectView() override; 31 ~ChosenObjectView() override;
32 32
33 // views::ButtonListener implementation. 33 // views::ButtonListener implementation.
34 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 34 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
35 35
36 views::ImageView* icon_; // Owned by the views hierarchy. 36 views::ImageView* icon_; // Owned by the views hierarchy.
37 views::ImageButton* delete_button_; // Owned by the views hierarchy. 37 views::ImageButton* delete_button_; // Owned by the views hierarchy.
38 38
39 base::ObserverList<ChosenObjectViewObserver> observer_list_; 39 base::ObserverList<ChosenObjectViewObserver> observer_list_;
40 scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo> info_; 40 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(ChosenObjectView); 42 DISALLOW_COPY_AND_ASSIGN(ChosenObjectView);
43 }; 43 };
44 44
45 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_ 45 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_CHOSEN_OBJECT_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698