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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "chrome/browser/ui/website_settings/website_settings.h" 13 #include "chrome/browser/ui/website_settings/website_settings.h"
14 #include "components/content_settings/core/common/content_settings.h" 14 #include "components/content_settings/core/common/content_settings.h"
15 #include "components/content_settings/core/common/content_settings_types.h" 15 #include "components/content_settings/core/common/content_settings_types.h"
16 #include "content/public/browser/permission_type.h" 16 #include "content/public/browser/permission_type.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 18
19 class GURL; 19 class GURL;
20 class Profile; 20 class Profile;
21 class WebsiteSettings; 21 class WebsiteSettings;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // The settings source e.g. user, extensions, policy, ... . 74 // The settings source e.g. user, extensions, policy, ... .
75 content_settings::SettingSource source; 75 content_settings::SettingSource source;
76 // Whether the profile is off the record. 76 // Whether the profile is off the record.
77 bool is_incognito; 77 bool is_incognito;
78 }; 78 };
79 79
80 // |ChosenObjectInfo| contains information about a single |object| of a 80 // |ChosenObjectInfo| contains information about a single |object| of a
81 // chooser |type| that the current website has been granted access to. 81 // chooser |type| that the current website has been granted access to.
82 struct ChosenObjectInfo { 82 struct ChosenObjectInfo {
83 ChosenObjectInfo(const WebsiteSettings::ChooserUIInfo& ui_info, 83 ChosenObjectInfo(const WebsiteSettings::ChooserUIInfo& ui_info,
84 scoped_ptr<base::DictionaryValue> object); 84 std::unique_ptr<base::DictionaryValue> object);
85 ~ChosenObjectInfo(); 85 ~ChosenObjectInfo();
86 // |ui_info| for this chosen object type. 86 // |ui_info| for this chosen object type.
87 const WebsiteSettings::ChooserUIInfo& ui_info; 87 const WebsiteSettings::ChooserUIInfo& ui_info;
88 // The opaque |object| representing the thing the user selected. 88 // The opaque |object| representing the thing the user selected.
89 scoped_ptr<base::DictionaryValue> object; 89 std::unique_ptr<base::DictionaryValue> object;
90 }; 90 };
91 91
92 // |IdentityInfo| contains information about the site's identity and 92 // |IdentityInfo| contains information about the site's identity and
93 // connection. 93 // connection.
94 struct IdentityInfo { 94 struct IdentityInfo {
95 IdentityInfo(); 95 IdentityInfo();
96 ~IdentityInfo(); 96 ~IdentityInfo();
97 97
98 // The site's identity: the certificate's Organization Name for sites with 98 // The site's identity: the certificate's Organization Name for sites with
99 // Extended Validation certificates, or the URL's hostname for all other 99 // Extended Validation certificates, or the URL's hostname for all other
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 189
190 // Selects the tab with the given |tab_id|. 190 // Selects the tab with the given |tab_id|.
191 virtual void SetSelectedTab(TabId tab_id) = 0; 191 virtual void SetSelectedTab(TabId tab_id) = 0;
192 }; 192 };
193 193
194 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList; 194 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList;
195 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList; 195 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList;
196 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList; 196 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList;
197 197
198 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 198 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698