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

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

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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 #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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 #if defined(OFFICIAL_BUILD) 361 #if defined(OFFICIAL_BUILD)
362 if (browser_defaults::enable_help_app) { 362 if (browser_defaults::enable_help_app) {
363 Add(IDR_HELP_MANIFEST, 363 Add(IDR_HELP_MANIFEST,
364 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"))); 364 FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp")));
365 } 365 }
366 #endif 366 #endif
367 #endif // !defined(OS_CHROMEOS) 367 #endif // !defined(OS_CHROMEOS)
368 368
369 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store"))); 369 Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store")));
370 370
371 #if defined(OS_WIN) 371 #if defined(ENABLE_SETTINGS_APP)
372 Add(IDR_SETTINGS_APP_MANIFEST, FilePath(FILE_PATH_LITERAL("settings_app"))); 372 Add(IDR_SETTINGS_APP_MANIFEST, FilePath(FILE_PATH_LITERAL("settings_app")));
373 #endif 373 #endif
374 374
375 #if !defined(OS_CHROMEOS) 375 #if !defined(OS_CHROMEOS)
376 // Cloud Print component app. Not required on Chrome OS. 376 // Cloud Print component app. Not required on Chrome OS.
377 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print"))); 377 Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print")));
378 #endif 378 #endif
379 379
380 #if defined(OS_CHROMEOS) 380 #if defined(OS_CHROMEOS)
381 // Register access extensions only if accessibility is enabled. 381 // Register access extensions only if accessibility is enabled.
(...skipping 27 matching lines...) Expand all
409 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) { 409 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
410 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 410 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
411 std::string() /* default_value */, 411 std::string() /* default_value */,
412 PrefService::UNSYNCABLE_PREF); 412 PrefService::UNSYNCABLE_PREF);
413 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 413 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
414 std::string() /* default_value */, 414 std::string() /* default_value */,
415 PrefService::UNSYNCABLE_PREF); 415 PrefService::UNSYNCABLE_PREF);
416 } 416 }
417 417
418 } // namespace extensions 418 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698