summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/extensions')
-rw-r--r--chrome/browser/chromeos/extensions/default_app_order.cc2
-rw-r--r--chrome/browser/chromeos/extensions/default_app_order_unittest.cc2
-rw-r--r--chrome/browser/chromeos/extensions/external_filesystem_apitest.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_handler_api.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_handler_api.h2
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_private_api.cc4
-rw-r--r--chrome/browser/chromeos/extensions/file_manager_browsertest.cc2
-rw-r--r--chrome/browser/chromeos/extensions/file_manager_util.h2
-rw-r--r--chrome/browser/chromeos/extensions/install_limiter.h2
-rw-r--r--chrome/browser/chromeos/extensions/zip_file_creator.h2
10 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc
index d9acdc5..3f6bce4 100644
--- a/chrome/browser/chromeos/extensions/default_app_order.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
#include "base/path_service.h"
#include "base/time.h"
diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
index 73ada42..689b032 100644
--- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
index ce0c101..9bb26fa 100644
--- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/bind.h"
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
index a46ecba..a95ae51 100644
--- a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
@@ -31,8 +31,8 @@
#include "chrome/browser/chromeos/extensions/file_browser_handler_api.h"
#include "base/bind.h"
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop_proxy.h"
#include "base/platform_file.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.h b/chrome/browser/chromeos/extensions/file_browser_handler_api.h
index 565cf32..851ef8f 100644
--- a/chrome/browser/chromeos/extensions/file_browser_handler_api.h
+++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.h
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "base/file_path.h"
+#include "base/files/file_path.h"
#include "chrome/browser/extensions/extension_function.h"
class Browser;
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 460f4da..dcff9c8 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -12,8 +12,8 @@
#include "base/base64.h"
#include "base/bind.h"
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/i18n/case_conversion.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
@@ -74,6 +74,7 @@
#include "net/base/network_change_notifier.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/shell_dialogs/selected_file_info.h"
+#include "ui/webui/web_ui_util.h"
#include "webkit/chromeos/fileapi/cros_mount_point_provider.h"
#include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_file_util.h"
@@ -81,7 +82,6 @@
#include "webkit/fileapi/file_system_types.h"
#include "webkit/fileapi/file_system_url.h"
#include "webkit/fileapi/file_system_util.h"
-#include "ui/webui/web_ui_util.h"
using extensions::app_file_handler_util::FindFileHandlersForMimeTypes;
using chromeos::disks::DiskMountManager;
diff --git a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc
index 41aa6f0..5dd7024 100644
--- a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc
@@ -12,8 +12,8 @@
#include <string>
#include "base/callback.h"
-#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
#include "base/platform_file.h"
#include "base/threading/platform_thread.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h
index 00743b8..52cfe30 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager_util.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/file_path.h"
+#include "base/files/file_path.h"
#include "chrome/browser/google_apis/operation_registry.h"
#include "googleurl/src/gurl.h"
#include "ui/shell_dialogs/select_file_dialog.h"
diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h
index 9b59dd4..1a470e5 100644
--- a/chrome/browser/chromeos/extensions/install_limiter.h
+++ b/chrome/browser/chromeos/extensions/install_limiter.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/timer.h"
diff --git a/chrome/browser/chromeos/extensions/zip_file_creator.h b/chrome/browser/chromeos/extensions/zip_file_creator.h
index d43e8d2..78b82d5 100644
--- a/chrome/browser/chromeos/extensions/zip_file_creator.h
+++ b/chrome/browser/chromeos/extensions/zip_file_creator.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/file_path.h"
+#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/platform_file.h"
#include "chrome/common/extensions/extension.h"