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

Side by Side Diff: chrome/browser/extensions/extension_management.h

Issue 593223003: Fix default value of ExtensionManagement::IndividualSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes addressing #3 Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_management.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_EXTENSIONS_EXTENSION_MANAGEMENT_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 INSTALLATION_BLOCKED, 57 INSTALLATION_BLOCKED,
58 INSTALLATION_FORCED, 58 INSTALLATION_FORCED,
59 INSTALLATION_RECOMMENDED, 59 INSTALLATION_RECOMMENDED,
60 }; 60 };
61 61
62 // Class to hold extension management settings for one or a group of 62 // Class to hold extension management settings for one or a group of
63 // extensions. Settings can be applied to an individual extension identified 63 // extensions. Settings can be applied to an individual extension identified
64 // by an ID, a group of extensions with specific |update_url| or all 64 // by an ID, a group of extensions with specific |update_url| or all
65 // extensions at once. 65 // extensions at once.
66 struct IndividualSettings { 66 struct IndividualSettings {
67 IndividualSettings();
68 ~IndividualSettings();
69
67 void Reset(); 70 void Reset();
68 71
69 // Extension installation mode. Setting this to INSTALLATION_FORCED or 72 // Extension installation mode. Setting this to INSTALLATION_FORCED or
70 // INSTALLATION_RECOMMENDED will enable extension auto-loading (only 73 // INSTALLATION_RECOMMENDED will enable extension auto-loading (only
71 // applicable to single extension), and in this case the |update_url| must 74 // applicable to single extension), and in this case the |update_url| must
72 // be specified, containing the update URL for this extension. 75 // be specified, containing the update URL for this extension.
73 // Note that |update_url| will be ignored for INSTALLATION_ALLOWED and 76 // Note that |update_url| will be ignored for INSTALLATION_ALLOWED and
74 // INSTALLATION_BLOCKED installation mode. 77 // INSTALLATION_BLOCKED installation mode.
78 // These settings will override the default settings, and unspecified
79 // settings will take value from default settings.
75 InstallationMode installation_mode; 80 InstallationMode installation_mode;
76 std::string update_url; 81 std::string update_url;
77 }; 82 };
78 83
79 // Global extension management settings, applicable to all extensions. 84 // Global extension management settings, applicable to all extensions.
80 struct GlobalSettings { 85 struct GlobalSettings {
81 GlobalSettings(); 86 GlobalSettings();
82 ~GlobalSettings(); 87 ~GlobalSettings();
83 88
84 void Reset(); 89 void Reset();
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 content::BrowserContext* context) const OVERRIDE; 200 content::BrowserContext* context) const OVERRIDE;
196 virtual void RegisterProfilePrefs( 201 virtual void RegisterProfilePrefs(
197 user_prefs::PrefRegistrySyncable* registry) OVERRIDE; 202 user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
198 203
199 DISALLOW_COPY_AND_ASSIGN(ExtensionManagementFactory); 204 DISALLOW_COPY_AND_ASSIGN(ExtensionManagementFactory);
200 }; 205 };
201 206
202 } // namespace extensions 207 } // namespace extensions
203 208
204 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_H_ 209 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_management.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698