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

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

Issue 12737003: Use GOOGLE_CHROME_BUILD instead of OFFICIAL BUILD for wallpaper picker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/launcher_context_menu.h » ('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 #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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 AddImageLoaderExtension(); 408 AddImageLoaderExtension();
409 409
410 #if defined(ENABLE_SETTINGS_APP) 410 #if defined(ENABLE_SETTINGS_APP)
411 Add(IDR_SETTINGS_APP_MANIFEST, 411 Add(IDR_SETTINGS_APP_MANIFEST,
412 base::FilePath(FILE_PATH_LITERAL("settings_app"))); 412 base::FilePath(FILE_PATH_LITERAL("settings_app")));
413 #endif 413 #endif
414 } 414 }
415 415
416 #if defined(OS_CHROMEOS) 416 #if defined(OS_CHROMEOS)
417 if (!skip_session_components) { 417 if (!skip_session_components) {
418 #if defined(OFFICIAL_BUILD) 418 #if defined(GOOGLE_CHROME_BUILD)
419 Add(IDR_WALLPAPERMANAGER_MANIFEST, 419 Add(IDR_WALLPAPERMANAGER_MANIFEST,
420 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 420 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
421 #endif // defined(OFFICIAL_BUILD) 421 #endif // defined(OFFICIAL_BUILD)
422 422
423 base::FilePath echo_extension_path(FILE_PATH_LITERAL( 423 base::FilePath echo_extension_path(FILE_PATH_LITERAL(
424 "/usr/share/chromeos-assets/echo")); 424 "/usr/share/chromeos-assets/echo"));
425 if (command_line->HasSwitch(switches::kEchoExtensionPath)) { 425 if (command_line->HasSwitch(switches::kEchoExtensionPath)) {
426 echo_extension_path = 426 echo_extension_path =
427 command_line->GetSwitchValuePath(switches::kEchoExtensionPath); 427 command_line->GetSwitchValuePath(switches::kEchoExtensionPath);
428 } 428 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { 462 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {
463 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 463 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
464 std::string() /* default_value */, 464 std::string() /* default_value */,
465 PrefRegistrySyncable::UNSYNCABLE_PREF); 465 PrefRegistrySyncable::UNSYNCABLE_PREF);
466 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, 466 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,
467 std::string() /* default_value */, 467 std::string() /* default_value */,
468 PrefRegistrySyncable::UNSYNCABLE_PREF); 468 PrefRegistrySyncable::UNSYNCABLE_PREF);
469 } 469 }
470 470
471 } // namespace extensions 471 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/launcher_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698