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

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

Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 <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 27 matching lines...) Expand all
38 #if defined(GOOGLE_CHROME_BUILD) 38 #if defined(GOOGLE_CHROME_BUILD)
39 #include "chrome/browser/defaults.h" 39 #include "chrome/browser/defaults.h"
40 #endif 40 #endif
41 41
42 #if defined(OS_CHROMEOS) 42 #if defined(OS_CHROMEOS)
43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
44 #include "chromeos/chromeos_switches.h" 44 #include "chromeos/chromeos_switches.h"
45 #include "content/public/browser/site_instance.h" 45 #include "content/public/browser/site_instance.h"
46 #include "content/public/browser/storage_partition.h" 46 #include "content/public/browser/storage_partition.h"
47 #include "extensions/browser/extensions_browser_client.h" 47 #include "extensions/browser/extensions_browser_client.h"
48 #include "webkit/browser/fileapi/file_system_context.h" 48 #include "storage/browser/fileapi/file_system_context.h"
49 #endif 49 #endif
50 50
51 #if defined(ENABLE_APP_LIST) 51 #if defined(ENABLE_APP_LIST)
52 #include "grit/chromium_strings.h" 52 #include "grit/chromium_strings.h"
53 #endif 53 #endif
54 54
55 using content::BrowserThread; 55 using content::BrowserThread;
56 56
57 namespace extensions { 57 namespace extensions {
58 58
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 if (command_line->HasSwitch(chromeos::switches::kGuestSession)) { 624 if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
625 // TODO(dpolukhin): Hack to enable HTML5 temporary file system for 625 // TODO(dpolukhin): Hack to enable HTML5 temporary file system for
626 // the extension. Some component extensions don't work without temporary 626 // the extension. Some component extensions don't work without temporary
627 // file system access. Make sure temporary file system is enabled in the off 627 // file system access. Make sure temporary file system is enabled in the off
628 // the record browser context (as that is the one used in guest session). 628 // the record browser context (as that is the one used in guest session).
629 content::BrowserContext* off_the_record_context = 629 content::BrowserContext* off_the_record_context =
630 ExtensionsBrowserClient::Get()->GetOffTheRecordContext( 630 ExtensionsBrowserClient::Get()->GetOffTheRecordContext(
631 browser_context_); 631 browser_context_);
632 GURL site = content::SiteInstance::GetSiteForURL( 632 GURL site = content::SiteInstance::GetSiteForURL(
633 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 633 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
634 fileapi::FileSystemContext* file_system_context = 634 storage::FileSystemContext* file_system_context =
635 content::BrowserContext::GetStoragePartitionForSite( 635 content::BrowserContext::GetStoragePartitionForSite(
636 off_the_record_context, site)->GetFileSystemContext(); 636 off_the_record_context, site)->GetFileSystemContext();
637 file_system_context->EnableTemporaryFileSystemInIncognito(); 637 file_system_context->EnableTemporaryFileSystemInIncognito();
638 } 638 }
639 #endif 639 #endif
640 } 640 }
641 641
642 } // namespace extensions 642 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698