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

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

Issue 9836039: Add reporting notification to the enterprise banner on the CrOS login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
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 #include "chrome/browser/extensions/component_loader.h" 5 #include "chrome/browser/extensions/component_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 // TODO(gauravsh): Only include offers extension on official builds. 295 // TODO(gauravsh): Only include offers extension on official builds.
296 FilePath offers_extension_path(FILE_PATH_LITERAL( 296 FilePath offers_extension_path(FILE_PATH_LITERAL(
297 "/usr/share/chromeos-assets/offers")); 297 "/usr/share/chromeos-assets/offers"));
298 if (command_line->HasSwitch(switches::kOffersExtensionPath)) { 298 if (command_line->HasSwitch(switches::kOffersExtensionPath)) {
299 offers_extension_path = 299 offers_extension_path =
300 command_line->GetSwitchValuePath(switches::kOffersExtensionPath); 300 command_line->GetSwitchValuePath(switches::kOffersExtensionPath);
301 } 301 }
302 Add(IDR_OFFERS_MANIFEST, offers_extension_path); 302 Add(IDR_OFFERS_MANIFEST, offers_extension_path);
303 303
304 #if defined(OFFICIAL_BUILD) 304 //#if defined(OFFICIAL_BUILD)
305 if (browser_defaults::enable_help_app) { 305 // if (browser_defaults::enable_help_app) {
306 Add(IDR_HELP_MANIFEST, 306 Add(IDR_HELP_MANIFEST,
307 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"))); 307 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp")));
308 } 308 // }
309 #endif 309 //#endif
310 #endif // !defined(OS_CHROMEOS) 310 #endif // !defined(OS_CHROMEOS)
311 311
312 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store"))); 312 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store")));
313 313
314 #if !defined(OS_CHROMEOS) 314 #if !defined(OS_CHROMEOS)
315 // Cloud Print component app. Not required on Chrome OS. 315 // Cloud Print component app. Not required on Chrome OS.
316 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print"))); 316 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print")));
317 #endif 317 #endif
318 318
319 #if defined(OS_CHROMEOS) 319 #if defined(OS_CHROMEOS)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 352 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
353 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 353 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
354 std::string() /* default_value */, 354 std::string() /* default_value */,
355 PrefService::UNSYNCABLE_PREF); 355 PrefService::UNSYNCABLE_PREF);
356 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 356 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
357 std::string() /* default_value */, 357 std::string() /* default_value */,
358 PrefService::UNSYNCABLE_PREF); 358 PrefService::UNSYNCABLE_PREF);
359 } 359 }
360 360
361 } // namespace extensions 361 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698