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

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

Issue 2146963004: Adding the creation flags back to pending extension info. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor comment Created 4 years, 5 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 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_PENDING_EXTENSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
6 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // Assumes an extension with id |id| is not already installed. 119 // Assumes an extension with id |id| is not already installed.
120 // Return true if the extension was added. 120 // Return true if the extension was added.
121 bool AddExtensionImpl( 121 bool AddExtensionImpl(
122 const std::string& id, 122 const std::string& id,
123 const std::string& install_parameter, 123 const std::string& install_parameter,
124 const GURL& update_url, 124 const GURL& update_url,
125 const base::Version& version, 125 const base::Version& version,
126 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install, 126 PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
127 bool is_from_sync, 127 bool is_from_sync,
128 Manifest::Location install_source, 128 Manifest::Location install_source,
129 int creation_flags,
129 bool mark_acknowledged, 130 bool mark_acknowledged,
130 bool remote_install); 131 bool remote_install);
131 132
132 // Add a pending extension record directly. Used for unit tests that need 133 // Add a pending extension record directly. Used for unit tests that need
133 // to set an inital state. Use friendship to allow the tests to call this 134 // to set an inital state. Use friendship to allow the tests to call this
134 // method. 135 // method.
135 void AddForTesting(const PendingExtensionInfo& pending_extension_info); 136 void AddForTesting(const PendingExtensionInfo& pending_extension_info);
136 137
137 // The BrowserContext with which the manager is associated. 138 // The BrowserContext with which the manager is associated.
138 content::BrowserContext* context_; 139 content::BrowserContext* context_;
139 140
140 PendingExtensionList pending_extension_list_; 141 PendingExtensionList pending_extension_list_;
141 142
142 FRIEND_TEST_ALL_PREFIXES(::ExtensionServiceTest, 143 FRIEND_TEST_ALL_PREFIXES(::ExtensionServiceTest,
143 UpdatePendingExtensionAlreadyInstalled); 144 UpdatePendingExtensionAlreadyInstalled);
144 friend class ExtensionUpdaterTest; 145 friend class ExtensionUpdaterTest;
145 friend void SetupPendingExtensionManagerForTest( 146 friend void SetupPendingExtensionManagerForTest(
146 int count, const GURL& update_url, 147 int count, const GURL& update_url,
147 PendingExtensionManager* pending_extension_manager); 148 PendingExtensionManager* pending_extension_manager);
148 149
149 DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager); 150 DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager);
150 }; 151 };
151 152
152 } // namespace extensions 153 } // namespace extensions
153 154
154 #endif // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_ 155 #endif // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/pending_extension_info.cc ('k') | chrome/browser/extensions/pending_extension_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698