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

Side by Side Diff: chrome/browser/ui/webui/site_settings_helper.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_WEBUI_SITE_SETTINGS_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_
6 #define CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/memory/scoped_ptr.h"
12 #include "components/content_settings/core/common/content_settings.h" 12 #include "components/content_settings/core/common/content_settings.h"
13 #include "components/content_settings/core/common/content_settings_pattern.h" 13 #include "components/content_settings/core/common/content_settings_pattern.h"
14 #include "components/content_settings/core/common/content_settings_types.h" 14 #include "components/content_settings/core/common/content_settings_types.h"
15 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
16 16
17 class HostContentSettingsMap; 17 class HostContentSettingsMap;
18 18
19 namespace base { 19 namespace base {
20 class DictionaryValue; 20 class DictionaryValue;
21 class ListValue; 21 class ListValue;
(...skipping 21 matching lines...) Expand all
43 void GetExceptionsFromHostContentSettingsMap( 43 void GetExceptionsFromHostContentSettingsMap(
44 const HostContentSettingsMap* map, 44 const HostContentSettingsMap* map,
45 ContentSettingsType type, 45 ContentSettingsType type,
46 content::WebUI* web_ui, 46 content::WebUI* web_ui,
47 base::ListValue* exceptions); 47 base::ListValue* exceptions);
48 48
49 // Returns exceptions constructed from the policy-set allowed URLs 49 // Returns exceptions constructed from the policy-set allowed URLs
50 // for the content settings |type| mic or camera. 50 // for the content settings |type| mic or camera.
51 void GetPolicyAllowedUrls( 51 void GetPolicyAllowedUrls(
52 ContentSettingsType type, 52 ContentSettingsType type,
53 std::vector<scoped_ptr<base::DictionaryValue>>* exceptions, 53 std::vector<std::unique_ptr<base::DictionaryValue>>* exceptions,
54 content::WebUI* web_ui); 54 content::WebUI* web_ui);
55 55
56 } // namespace site_settings 56 } // namespace site_settings
57 57
58 #endif // CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_ 58 #endif // CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_screen_handler.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698