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

Side by Side Diff: chrome/installer/util/product.h

Issue 2619233002: Remove ChromeFrameDistribution and ChromeFrameOperations from installer_util. (Closed)
Patch Set: sync to position 442533 Created 3 years, 11 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 | « chrome/installer/util/chrome_frame_operations.cc ('k') | chrome/installer/util/product.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_INSTALLER_UTIL_PRODUCT_H_ 5 #ifndef CHROME_INSTALLER_UTIL_PRODUCT_H_
6 #define CHROME_INSTALLER_UTIL_PRODUCT_H_ 6 #define CHROME_INSTALLER_UTIL_PRODUCT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 bool is_type(BrowserDistribution::Type type) const { 55 bool is_type(BrowserDistribution::Type type) const {
56 return distribution_->GetType() == type; 56 return distribution_->GetType() == type;
57 } 57 }
58 58
59 bool is_chrome() const { 59 bool is_chrome() const {
60 return distribution_->GetType() == BrowserDistribution::CHROME_BROWSER; 60 return distribution_->GetType() == BrowserDistribution::CHROME_BROWSER;
61 } 61 }
62 62
63 bool is_chrome_frame() const {
64 return distribution_->GetType() == BrowserDistribution::CHROME_FRAME;
65 }
66
67 bool is_chrome_binaries() const { 63 bool is_chrome_binaries() const {
68 return distribution_->GetType() == BrowserDistribution::CHROME_BINARIES; 64 return distribution_->GetType() == BrowserDistribution::CHROME_BINARIES;
69 } 65 }
70 66
71 bool HasOption(const std::wstring& option) const { 67 bool HasOption(const std::wstring& option) const {
72 return options_.find(option) != options_.end(); 68 return options_.find(option) != options_.end();
73 } 69 }
74 70
75 // Returns true if the set of options is mutated by this operation. 71 // Returns true if the set of options is mutated by this operation.
76 bool SetOption(const std::wstring& option, bool set) { 72 bool SetOption(const std::wstring& option, bool set) {
(...skipping 21 matching lines...) Expand all
98 // ClientState key. 94 // ClientState key.
99 bool SetMsiMarker(bool system_install, bool set) const; 95 bool SetMsiMarker(bool system_install, bool set) const;
100 96
101 // Returns true if setup should create an entry in the Add/Remove list 97 // Returns true if setup should create an entry in the Add/Remove list
102 // of installed applications. 98 // of installed applications.
103 bool ShouldCreateUninstallEntry() const; 99 bool ShouldCreateUninstallEntry() const;
104 100
105 // See ProductOperations::AddKeyFiles. 101 // See ProductOperations::AddKeyFiles.
106 void AddKeyFiles(std::vector<base::FilePath>* key_files) const; 102 void AddKeyFiles(std::vector<base::FilePath>* key_files) const;
107 103
108 // See ProductOperations::AddComDllList.
109 void AddComDllList(std::vector<base::FilePath>* com_dll_list) const;
110
111 // See ProductOperations::AppendProductFlags. 104 // See ProductOperations::AppendProductFlags.
112 void AppendProductFlags(base::CommandLine* command_line) const; 105 void AppendProductFlags(base::CommandLine* command_line) const;
113 106
114 // See ProductOperations::AppendRenameFlags. 107 // See ProductOperations::AppendRenameFlags.
115 void AppendRenameFlags(base::CommandLine* command_line) const; 108 void AppendRenameFlags(base::CommandLine* command_line) const;
116 109
117 // See Productoperations::SetChannelFlags. 110 // See Productoperations::SetChannelFlags.
118 bool SetChannelFlags(bool set, ChannelInfo* channel_info) const; 111 bool SetChannelFlags(bool set, ChannelInfo* channel_info) const;
119 112
120 // See ProductOperations::AddDefaultShortcutProperties. 113 // See ProductOperations::AddDefaultShortcutProperties.
(...skipping 14 matching lines...) Expand all
135 std::unique_ptr<ProductOperations> operations_; 128 std::unique_ptr<ProductOperations> operations_;
136 std::set<std::wstring> options_; 129 std::set<std::wstring> options_;
137 130
138 private: 131 private:
139 DISALLOW_COPY_AND_ASSIGN(Product); 132 DISALLOW_COPY_AND_ASSIGN(Product);
140 }; 133 };
141 134
142 } // namespace installer 135 } // namespace installer
143 136
144 #endif // CHROME_INSTALLER_UTIL_PRODUCT_H_ 137 #endif // CHROME_INSTALLER_UTIL_PRODUCT_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/chrome_frame_operations.cc ('k') | chrome/installer/util/product.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698