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

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

Issue 328143004: Change branding of Quickoffice flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 5 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 | « chrome/browser/about_flags.cc ('k') | 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 <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 #if defined(GOOGLE_CHROME_BUILD) 519 #if defined(GOOGLE_CHROME_BUILD)
520 install_feedback = true; 520 install_feedback = true;
521 #endif // defined(GOOGLE_CHROME_BUILD) 521 #endif // defined(GOOGLE_CHROME_BUILD)
522 if (install_feedback) 522 if (install_feedback)
523 Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); 523 Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")));
524 524
525 #if defined(OS_CHROMEOS) 525 #if defined(OS_CHROMEOS)
526 if (!skip_session_components) { 526 if (!skip_session_components) {
527 #if defined(GOOGLE_CHROME_BUILD) 527 #if defined(GOOGLE_CHROME_BUILD)
528 if (!command_line->HasSwitch( 528 if (!command_line->HasSwitch(
529 chromeos::switches::kDisableQuickofficeComponentApp)) { 529 chromeos::switches::kDisableOfficeEditingComponentApp)) {
530 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath( 530 std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath(
531 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice"))); 531 FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice")));
532 EnableFileSystemInGuestMode(id); 532 EnableFileSystemInGuestMode(id);
533 } 533 }
534 #endif // defined(GOOGLE_CHROME_BUILD) 534 #endif // defined(GOOGLE_CHROME_BUILD)
535 535
536 Add(IDR_ECHO_MANIFEST, 536 Add(IDR_ECHO_MANIFEST,
537 base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/echo"))); 537 base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/echo")));
538 538
539 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) { 539 if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 641 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
642 fileapi::FileSystemContext* file_system_context = 642 fileapi::FileSystemContext* file_system_context =
643 content::BrowserContext::GetStoragePartitionForSite( 643 content::BrowserContext::GetStoragePartitionForSite(
644 off_the_record_context, site)->GetFileSystemContext(); 644 off_the_record_context, site)->GetFileSystemContext();
645 file_system_context->EnableTemporaryFileSystemInIncognito(); 645 file_system_context->EnableTemporaryFileSystemInIncognito();
646 } 646 }
647 #endif 647 #endif
648 } 648 }
649 649
650 } // namespace extensions 650 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698