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

Side by Side Diff: components/content_settings/core/browser/website_settings_info.h

Issue 1549003002: Switch to standard integer types in base/memory/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_ 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_ 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "components/content_settings/core/common/content_settings_types.h" 14 #include "components/content_settings/core/common/content_settings_types.h"
13 15
14 namespace base { 16 namespace base {
15 class Value; 17 class Value;
16 } // namespace base 18 } // namespace base
17 19
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 const std::string& name() const { return name_; } 54 const std::string& name() const { return name_; }
53 55
54 const std::string& pref_name() const { return pref_name_; } 56 const std::string& pref_name() const { return pref_name_; }
55 const std::string& default_value_pref_name() const { 57 const std::string& default_value_pref_name() const {
56 return default_value_pref_name_; 58 return default_value_pref_name_;
57 } 59 }
58 const base::Value* initial_default_value() const { 60 const base::Value* initial_default_value() const {
59 return initial_default_value_.get(); 61 return initial_default_value_.get();
60 } 62 }
61 63
62 uint32 GetPrefRegistrationFlags() const; 64 uint32_t GetPrefRegistrationFlags() const;
63 65
64 ScopingType scoping_type() const { return scoping_type_; } 66 ScopingType scoping_type() const { return scoping_type_; }
65 67
66 private: 68 private:
67 const ContentSettingsType type_; 69 const ContentSettingsType type_;
68 const std::string name_; 70 const std::string name_;
69 71
70 const std::string pref_name_; 72 const std::string pref_name_;
71 const std::string default_value_pref_name_; 73 const std::string default_value_pref_name_;
72 const scoped_ptr<base::Value> initial_default_value_; 74 const scoped_ptr<base::Value> initial_default_value_;
73 const SyncStatus sync_status_; 75 const SyncStatus sync_status_;
74 const LossyStatus lossy_status_; 76 const LossyStatus lossy_status_;
75 const ScopingType scoping_type_; 77 const ScopingType scoping_type_;
76 78
77 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo); 79 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
78 }; 80 };
79 81
80 } // namespace content_settings 82 } // namespace content_settings
81 83
82 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_ 84 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698