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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_browser_handlers.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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
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/chromeos/file_manager/file_browser_handlers.h" 5 #include "chrome/browser/chromeos/file_manager/file_browser_handlers.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/i18n/case_conversion.h" 9 #include "base/i18n/case_conversion.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/public/browser/site_instance.h" 25 #include "content/public/browser/site_instance.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "extensions/browser/event_router.h" 27 #include "extensions/browser/event_router.h"
28 #include "extensions/browser/extension_host.h" 28 #include "extensions/browser/extension_host.h"
29 #include "extensions/browser/extension_system.h" 29 #include "extensions/browser/extension_system.h"
30 #include "extensions/browser/extension_util.h" 30 #include "extensions/browser/extension_util.h"
31 #include "extensions/browser/lazy_background_task_queue.h" 31 #include "extensions/browser/lazy_background_task_queue.h"
32 #include "extensions/common/extension_set.h" 32 #include "extensions/common/extension_set.h"
33 #include "extensions/common/manifest_handlers/background_info.h" 33 #include "extensions/common/manifest_handlers/background_info.h"
34 #include "net/base/escape.h" 34 #include "net/base/escape.h"
35 #include "storage/browser/fileapi/file_system_context.h"
36 #include "storage/browser/fileapi/file_system_url.h"
35 #include "storage/common/fileapi/file_system_info.h" 37 #include "storage/common/fileapi/file_system_info.h"
36 #include "storage/common/fileapi/file_system_util.h" 38 #include "storage/common/fileapi/file_system_util.h"
37 #include "webkit/browser/fileapi/file_system_context.h"
38 #include "webkit/browser/fileapi/file_system_url.h"
39 39
40 using content::BrowserThread; 40 using content::BrowserThread;
41 using content::ChildProcessSecurityPolicy; 41 using content::ChildProcessSecurityPolicy;
42 using content::SiteInstance; 42 using content::SiteInstance;
43 using content::WebContents; 43 using content::WebContents;
44 using extensions::Extension; 44 using extensions::Extension;
45 using storage::FileSystemURL; 45 using storage::FileSystemURL;
46 using file_manager::util::EntryDefinition; 46 using file_manager::util::EntryDefinition;
47 using file_manager::util::EntryDefinitionList; 47 using file_manager::util::EntryDefinitionList;
48 using file_manager::util::FileDefinition; 48 using file_manager::util::FileDefinition;
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 if (common_handlers.empty()) 516 if (common_handlers.empty())
517 return FileBrowserHandlerList(); 517 return FileBrowserHandlerList();
518 } 518 }
519 } 519 }
520 520
521 return common_handlers; 521 return common_handlers;
522 } 522 }
523 523
524 } // namespace file_browser_handlers 524 } // namespace file_browser_handlers
525 } // namespace file_manager 525 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698