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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.h

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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 <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
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"
17 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
18 17
19 class Profile; 18 class Profile;
20 class WebsiteSettings; 19 class WebsiteSettings;
21 20
22 namespace gfx { 21 namespace gfx {
23 class Image; 22 class Image;
24 } 23 }
25 24
26 namespace net { 25 namespace net {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 195
197 // Sets site identity information. 196 // Sets site identity information.
198 virtual void SetIdentityInfo(const IdentityInfo& identity_info) = 0; 197 virtual void SetIdentityInfo(const IdentityInfo& identity_info) = 0;
199 }; 198 };
200 199
201 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList; 200 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList;
202 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList; 201 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList;
203 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList; 202 typedef WebsiteSettingsUI::ChosenObjectInfoList ChosenObjectInfoList;
204 203
205 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ 204 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698