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

Side by Side Diff: chrome/browser/extensions/pending_extension_info.cc

Issue 2146963004: Adding the creation flags back to pending extension info. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #include "chrome/browser/extensions/pending_extension_info.h" 5 #include "chrome/browser/extensions/pending_extension_info.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace extensions { 9 namespace extensions {
10 10
11 PendingExtensionInfo::PendingExtensionInfo( 11 PendingExtensionInfo::PendingExtensionInfo(
12 const std::string& id, 12 const std::string& id,
13 const std::string& install_parameter, 13 const std::string& install_parameter,
14 const GURL& update_url, 14 const GURL& update_url,
15 const Version& version, 15 const Version& version,
16 ShouldAllowInstallPredicate should_allow_install, 16 ShouldAllowInstallPredicate should_allow_install,
17 bool is_from_sync, 17 bool is_from_sync,
18 Manifest::Location install_source, 18 Manifest::Location install_source,
19 int creation_flags,
19 bool mark_acknowledged, 20 bool mark_acknowledged,
20 bool remote_install) 21 bool remote_install)
21 : id_(id), 22 : id_(id),
22 update_url_(update_url), 23 update_url_(update_url),
23 version_(version), 24 version_(version),
24 install_parameter_(install_parameter), 25 install_parameter_(install_parameter),
25 should_allow_install_(should_allow_install), 26 should_allow_install_(should_allow_install),
26 is_from_sync_(is_from_sync), 27 is_from_sync_(is_from_sync),
27 install_source_(install_source), 28 install_source_(install_source),
29 creation_flags_(creation_flags),
28 mark_acknowledged_(mark_acknowledged), 30 mark_acknowledged_(mark_acknowledged),
29 remote_install_(remote_install) { 31 remote_install_(remote_install) {
30 } 32 }
31 33
32 PendingExtensionInfo::PendingExtensionInfo() 34 PendingExtensionInfo::PendingExtensionInfo()
33 : update_url_(), 35 : update_url_(),
34 should_allow_install_(NULL), 36 should_allow_install_(NULL),
35 is_from_sync_(true), 37 is_from_sync_(true),
36 install_source_(Manifest::INVALID_LOCATION), 38 install_source_(Manifest::INVALID_LOCATION),
39 creation_flags_(0),
Devlin 2016/07/14 15:02:39 nit: prefer NO_FLAGS constant.
mamir 2016/07/15 18:58:14 Done.
37 mark_acknowledged_(false), 40 mark_acknowledged_(false),
38 remote_install_(false) { 41 remote_install_(false) {
39 } 42 }
40 43
41 PendingExtensionInfo::PendingExtensionInfo(const PendingExtensionInfo& other) = 44 PendingExtensionInfo::PendingExtensionInfo(const PendingExtensionInfo& other) =
42 default; 45 default;
43 46
44 PendingExtensionInfo::~PendingExtensionInfo() {} 47 PendingExtensionInfo::~PendingExtensionInfo() {}
45 48
46 bool PendingExtensionInfo::operator==(const PendingExtensionInfo& rhs) const { 49 bool PendingExtensionInfo::operator==(const PendingExtensionInfo& rhs) const {
(...skipping 20 matching lines...) Expand all
67 // Different install sources; |this| has higher precedence if 70 // Different install sources; |this| has higher precedence if
68 // |install_source_| is the higher priority source. 71 // |install_source_| is the higher priority source.
69 Manifest::Location higher_priority_source = 72 Manifest::Location higher_priority_source =
70 Manifest::GetHigherPriorityLocation( 73 Manifest::GetHigherPriorityLocation(
71 install_source_, other.install_source_); 74 install_source_, other.install_source_);
72 75
73 return higher_priority_source == install_source_ ? 1 : -1; 76 return higher_priority_source == install_source_ ? 1 : -1;
74 } 77 }
75 78
76 } // namespace extensions 79 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/pending_extension_info.h ('k') | chrome/browser/extensions/pending_extension_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698