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

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

Issue 15962012: Revert "Identity API: Add component app for auth flow UI" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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 #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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 base::FilePath(FILE_PATH_LITERAL("apps_debugger"))); 411 base::FilePath(FILE_PATH_LITERAL("apps_debugger")));
412 } 412 }
413 413
414 AddFileManagerExtension(); 414 AddFileManagerExtension();
415 AddImageLoaderExtension(); 415 AddImageLoaderExtension();
416 416
417 #if defined(ENABLE_SETTINGS_APP) 417 #if defined(ENABLE_SETTINGS_APP)
418 Add(IDR_SETTINGS_APP_MANIFEST, 418 Add(IDR_SETTINGS_APP_MANIFEST,
419 base::FilePath(FILE_PATH_LITERAL("settings_app"))); 419 base::FilePath(FILE_PATH_LITERAL("settings_app")));
420 #endif 420 #endif
421 Add(IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST,
422 base::FilePath(FILE_PATH_LITERAL("identity_scope_approval_dialog")));
423 } 421 }
424 422
425 #if defined(OS_CHROMEOS) 423 #if defined(OS_CHROMEOS)
426 if (!skip_session_components) { 424 if (!skip_session_components) {
427 Add(IDR_WALLPAPERMANAGER_MANIFEST, 425 Add(IDR_WALLPAPERMANAGER_MANIFEST,
428 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 426 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
429 427
430 #if defined(GOOGLE_CHROME_BUILD) 428 #if defined(GOOGLE_CHROME_BUILD)
431 if (!command_line->HasSwitch( 429 if (!command_line->HasSwitch(
432 chromeos::switches::kDisableQuickofficeComponentApp)) { 430 chromeos::switches::kDisableQuickofficeComponentApp)) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 prefs::kEnterpriseWebStoreURL, 492 prefs::kEnterpriseWebStoreURL,
495 std::string() /* default_value */, 493 std::string() /* default_value */,
496 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 494 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
497 registry->RegisterStringPref( 495 registry->RegisterStringPref(
498 prefs::kEnterpriseWebStoreName, 496 prefs::kEnterpriseWebStoreName,
499 std::string() /* default_value */, 497 std::string() /* default_value */,
500 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
501 } 499 }
502 500
503 } // namespace extensions 501 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698