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

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

Issue 292683002: Remove --echo-ext-path flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
« no previous file with comments | « no previous file | chromeos/chromeos_switches.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 <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 if (!skip_session_components) { 502 if (!skip_session_components) {
503 #if defined(GOOGLE_CHROME_BUILD) 503 #if defined(GOOGLE_CHROME_BUILD)
504 if (!command_line->HasSwitch( 504 if (!command_line->HasSwitch(
505 chromeos::switches::kDisableQuickofficeComponentApp)) { 505 chromeos::switches::kDisableQuickofficeComponentApp)) {
506 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath( 506 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath(
507 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice"))); 507 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice")));
508 EnableFileSystemInGuestMode(id); 508 EnableFileSystemInGuestMode(id);
509 } 509 }
510 #endif // defined(GOOGLE_CHROME_BUILD) 510 #endif // defined(GOOGLE_CHROME_BUILD)
511 511
512 base::FilePath echo_extension_path(FILE_PATH_LITERAL( 512 Add(IDR_ECHO_MANIFEST,
513 "/usr/share/chromeos-assets/echo")); 513 base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/echo")));
514 if (command_line->HasSwitch(chromeos::switches::kEchoExtensionPath)) {
515 echo_extension_path = command_line->GetSwitchValuePath(
516 chromeos::switches::kEchoExtensionPath);
517 }
518 Add(IDR_ECHO_MANIFEST, echo_extension_path);
519 514
520 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) { 515 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) {
521 Add(IDR_WALLPAPERMANAGER_MANIFEST, 516 Add(IDR_WALLPAPERMANAGER_MANIFEST,
522 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 517 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
523 } 518 }
524 519
525 if (!command_line->HasSwitch(chromeos::switches::kDisableFirstRunUI)) { 520 if (!command_line->HasSwitch(chromeos::switches::kDisableFirstRunUI)) {
526 Add(IDR_FIRST_RUN_DIALOG_MANIFEST, 521 Add(IDR_FIRST_RUN_DIALOG_MANIFEST,
527 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app"))); 522 base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app")));
528 } 523 }
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 619 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
625 fileapi::FileSystemContext* file_system_context = 620 fileapi::FileSystemContext* file_system_context =
626 content::BrowserContext::GetStoragePartitionForSite( 621 content::BrowserContext::GetStoragePartitionForSite(
627 off_the_record_context, site)->GetFileSystemContext(); 622 off_the_record_context, site)->GetFileSystemContext();
628 file_system_context->EnableTemporaryFileSystemInIncognito(); 623 file_system_context->EnableTemporaryFileSystemInIncognito();
629 } 624 }
630 #endif 625 #endif
631 } 626 }
632 627
633 } // namespace extensions 628 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698