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

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

Issue 14768009: Identity API: Add component app for auth flow UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to ToT 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 | 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 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")));
421 } 423 }
422 424
423 #if defined(OS_CHROMEOS) 425 #if defined(OS_CHROMEOS)
424 if (!skip_session_components) { 426 if (!skip_session_components) {
425 Add(IDR_WALLPAPERMANAGER_MANIFEST, 427 Add(IDR_WALLPAPERMANAGER_MANIFEST,
426 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 428 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
427 429
428 #if defined(GOOGLE_CHROME_BUILD) 430 #if defined(GOOGLE_CHROME_BUILD)
429 if (!command_line->HasSwitch( 431 if (!command_line->HasSwitch(
430 chromeos::switches::kDisableQuickofficeComponentApp)) { 432 chromeos::switches::kDisableQuickofficeComponentApp)) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 prefs::kEnterpriseWebStoreURL, 494 prefs::kEnterpriseWebStoreURL,
493 std::string() /* default_value */, 495 std::string() /* default_value */,
494 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 496 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
495 registry->RegisterStringPref( 497 registry->RegisterStringPref(
496 prefs::kEnterpriseWebStoreName, 498 prefs::kEnterpriseWebStoreName,
497 std::string() /* default_value */, 499 std::string() /* default_value */,
498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 500 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
499 } 501 }
500 502
501 } // namespace extensions 503 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698