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

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

Issue 163583004: Add GYP flag to optionally enable the Hangout Services extension in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing hack to copy to outer scope. Created 6 years, 10 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 Add(IDR_FILEMANAGER_MANIFEST, filemgr_extension_path); 282 Add(IDR_FILEMANAGER_MANIFEST, filemgr_extension_path);
283 return; 283 return;
284 } 284 }
285 #endif // NDEBUG 285 #endif // NDEBUG
286 Add(IDR_FILEMANAGER_MANIFEST, 286 Add(IDR_FILEMANAGER_MANIFEST,
287 base::FilePath(FILE_PATH_LITERAL("file_manager"))); 287 base::FilePath(FILE_PATH_LITERAL("file_manager")));
288 #endif // defined(OS_CHROMEOS) 288 #endif // defined(OS_CHROMEOS)
289 } 289 }
290 290
291 void ComponentLoader::AddHangoutServicesExtension() { 291 void ComponentLoader::AddHangoutServicesExtension() {
292 #if defined(GOOGLE_CHROME_BUILD) 292 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
293 Add(IDR_HANGOUT_SERVICES_MANIFEST, 293 Add(IDR_HANGOUT_SERVICES_MANIFEST,
294 base::FilePath(FILE_PATH_LITERAL("hangout_services"))); 294 base::FilePath(FILE_PATH_LITERAL("hangout_services")));
295 #endif 295 #endif
296 } 296 }
297 297
298 void ComponentLoader::AddHotwordHelperExtension() { 298 void ComponentLoader::AddHotwordHelperExtension() {
299 Profile* profile = static_cast<Profile*>(browser_context_); 299 Profile* profile = static_cast<Profile*>(browser_context_);
300 if (HotwordServiceFactory::IsHotwordAllowed(profile)) { 300 if (HotwordServiceFactory::IsHotwordAllowed(profile)) {
301 Add(IDR_HOTWORD_HELPER_MANIFEST, 301 Add(IDR_HOTWORD_HELPER_MANIFEST,
302 base::FilePath(FILE_PATH_LITERAL("hotword_helper"))); 302 base::FilePath(FILE_PATH_LITERAL("hotword_helper")));
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 612 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
613 fileapi::FileSystemContext* file_system_context = 613 fileapi::FileSystemContext* file_system_context =
614 content::BrowserContext::GetStoragePartitionForSite( 614 content::BrowserContext::GetStoragePartitionForSite(
615 off_the_record_context, site)->GetFileSystemContext(); 615 off_the_record_context, site)->GetFileSystemContext();
616 file_system_context->EnableTemporaryFileSystemInIncognito(); 616 file_system_context->EnableTemporaryFileSystemInIncognito();
617 } 617 }
618 #endif 618 #endif
619 } 619 }
620 620
621 } // namespace extensions 621 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698