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

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

Issue 196383030: [VideoPlayer] dedicated video player app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adressed the comment Created 6 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
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 277 const CommandLine* command_line = CommandLine::ForCurrentProcess();
278 if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) { 278 if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {
279 base::FilePath filemgr_extension_path( 279 base::FilePath filemgr_extension_path(
280 command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath)); 280 command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath));
281 Add(IDR_FILEMANAGER_MANIFEST, filemgr_extension_path); 281 Add(IDR_FILEMANAGER_MANIFEST, filemgr_extension_path);
282 return; 282 return;
283 } 283 }
284 #endif // NDEBUG 284 #endif // NDEBUG
285 Add(IDR_FILEMANAGER_MANIFEST, 285 Add(IDR_FILEMANAGER_MANIFEST,
286 base::FilePath(FILE_PATH_LITERAL("file_manager"))); 286 base::FilePath(FILE_PATH_LITERAL("file_manager")));
287 Add(IDR_VIDEOPLAYER_MANIFEST,
288 base::FilePath(FILE_PATH_LITERAL("video_player")));
asargent_no_longer_on_chrome 2014/03/20 18:42:11 nit: it seems a little strange to add the video pl
yoshiki 2014/03/24 02:08:38 Done.
287 #endif // defined(OS_CHROMEOS) 289 #endif // defined(OS_CHROMEOS)
288 } 290 }
289 291
290 void ComponentLoader::AddHangoutServicesExtension() { 292 void ComponentLoader::AddHangoutServicesExtension() {
291 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) 293 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
292 Add(IDR_HANGOUT_SERVICES_MANIFEST, 294 Add(IDR_HANGOUT_SERVICES_MANIFEST,
293 base::FilePath(FILE_PATH_LITERAL("hangout_services"))); 295 base::FilePath(FILE_PATH_LITERAL("hangout_services")));
294 #endif 296 #endif
295 } 297 }
296 298
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 615 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
614 fileapi::FileSystemContext* file_system_context = 616 fileapi::FileSystemContext* file_system_context =
615 content::BrowserContext::GetStoragePartitionForSite( 617 content::BrowserContext::GetStoragePartitionForSite(
616 off_the_record_context, site)->GetFileSystemContext(); 618 off_the_record_context, site)->GetFileSystemContext();
617 file_system_context->EnableTemporaryFileSystemInIncognito(); 619 file_system_context->EnableTemporaryFileSystemInIncognito();
618 } 620 }
619 #endif 621 #endif
620 } 622 }
621 623
622 } // namespace extensions 624 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698