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

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_selector_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_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_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/observer_list.h" 12 #include "base/observer_list.h"
12 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
13 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h" 14 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h"
14 #include "chrome/browser/ui/website_settings/permission_menu_model.h" 15 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
15 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 16 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
16 #include "components/content_settings/core/common/content_settings.h" 17 #include "components/content_settings/core/common/content_settings.h"
17 #include "components/content_settings/core/common/content_settings_types.h" 18 #include "components/content_settings/core/common/content_settings_types.h"
18 #include "ui/views/controls/button/menu_button_listener.h" 19 #include "ui/views/controls/button/menu_button_listener.h"
19 #include "ui/views/view.h" 20 #include "ui/views/view.h"
20 21
(...skipping 18 matching lines...) Expand all
39 void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission); 40 void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission);
40 41
41 protected: 42 protected:
42 // Overridden from views::View. 43 // Overridden from views::View.
43 void ChildPreferredSizeChanged(View* child) override; 44 void ChildPreferredSizeChanged(View* child) override;
44 45
45 private: 46 private:
46 ~PermissionSelectorView() override; 47 ~PermissionSelectorView() override;
47 48
48 // Model for the permission's menu. 49 // Model for the permission's menu.
49 scoped_ptr<PermissionMenuModel> menu_model_; 50 std::unique_ptr<PermissionMenuModel> menu_model_;
50 51
51 views::ImageView* icon_; // Owned by the views hierachy. 52 views::ImageView* icon_; // Owned by the views hierachy.
52 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy. 53 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy.
53 54
54 base::ObserverList<PermissionSelectorViewObserver, false> observer_list_; 55 base::ObserverList<PermissionSelectorViewObserver, false> observer_list_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView); 57 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView);
57 }; 58 };
58 59
59 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ 60 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698