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

Side by Side Diff: chrome/browser/chromeos/mobile_config.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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 (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_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 6 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 static MobileConfig* GetInstance(); 144 static MobileConfig* GetInstance();
145 145
146 // Returns carrier by external ID or NULL if there's no such carrier. 146 // Returns carrier by external ID or NULL if there's no such carrier.
147 const MobileConfig::Carrier* GetCarrier(const std::string& carrier_id) const; 147 const MobileConfig::Carrier* GetCarrier(const std::string& carrier_id) const;
148 148
149 // Returns locale specific config by initial locale or NULL 149 // Returns locale specific config by initial locale or NULL
150 // if there's no such config defined. 150 // if there's no such config defined.
151 const MobileConfig::LocaleConfig* GetLocaleConfig() const; 151 const MobileConfig::LocaleConfig* GetLocaleConfig() const;
152 152
153 protected: 153 protected:
154 virtual bool LoadManifestFromString(const std::string& manifest) OVERRIDE; 154 virtual bool LoadManifestFromString(const std::string& manifest) override;
155 155
156 private: 156 private:
157 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, Basic); 157 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, Basic);
158 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, BadManifest); 158 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, BadManifest);
159 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, DealOtherLocale); 159 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, DealOtherLocale);
160 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, OldDeal); 160 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, OldDeal);
161 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfigNoDeals); 161 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfigNoDeals);
162 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfig); 162 FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfig);
163 friend struct DefaultSingletonTraits<MobileConfig>; 163 friend struct DefaultSingletonTraits<MobileConfig>;
164 164
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // Root value of the local config (if it exists). 197 // Root value of the local config (if it exists).
198 // Global config is stored in root_ of the base class. 198 // Global config is stored in root_ of the base class.
199 scoped_ptr<base::DictionaryValue> local_config_root_; 199 scoped_ptr<base::DictionaryValue> local_config_root_;
200 200
201 DISALLOW_COPY_AND_ASSIGN(MobileConfig); 201 DISALLOW_COPY_AND_ASSIGN(MobileConfig);
202 }; 202 };
203 203
204 } // namespace chromeos 204 } // namespace chromeos
205 205
206 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_ 206 #endif // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator.h ('k') | chrome/browser/chromeos/net/cert_verify_proc_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698