diff options
11 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/chromeos/drive/drive_task_executor.cc b/chrome/browser/chromeos/drive/drive_task_executor.cc index 17014b3..d20ac80 100644 --- a/chrome/browser/chromeos/drive/drive_task_executor.cc +++ b/chrome/browser/chromeos/drive/drive_task_executor.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_system_service.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" #include "chrome/browser/google_apis/drive_service_interface.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc index c217389..5ad9f6f 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" #include <sys/stat.h> #include <sys/statvfs.h> @@ -31,8 +31,8 @@ #include "chrome/browser/chromeos/drive/drive_system_service.h" #include "chrome/browser/chromeos/drive/drive_webapps_registry.h" #include "chrome/browser/chromeos/drive/search_metadata.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" #include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h" #include "chrome/browser/chromeos/extensions/file_manager/file_handler_util.h" #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" #include "chrome/browser/chromeos/extensions/zip_file_creator.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h index bebdcbe..6e56550 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.h +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_ -#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_ +#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_ +#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_ #include <map> #include <queue> @@ -895,4 +895,4 @@ class OpenNewWindowFunction : public AsyncExtensionFunction { virtual bool RunImpl() OVERRIDE; }; -#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_ +#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_ diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api_factory.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc index ce6e337..9436d24 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api_factory.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h" #include "chrome/browser/chromeos/drive/drive_system_service.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api_factory.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h index b7ed1ac..9f7678f 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api_factory.h +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_FACTORY_H_ -#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_FACTORY_H_ +#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_ +#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_ #include "base/memory/singleton.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h" @@ -37,4 +37,4 @@ class FileBrowserPrivateAPIFactory : public ProfileKeyedServiceFactory { const OVERRIDE; }; -#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_FACTORY_H_ +#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_ diff --git a/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc index 628dc77..628dc77 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router_browsertest.cc index 31e3407..833747c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router_browsertest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc index ba7276f..0a3aea5 100644 --- a/chrome/browser/profiles/profile_dependency_manager.cc +++ b/chrome/browser/profiles/profile_dependency_manager.cc @@ -112,7 +112,7 @@ #include "chrome/browser/chromeos/extensions/networking_private_event_router_factory.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #if defined(FILE_MANAGER_EXTENSION) -#include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h" #endif #endif diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index 7276c9f..1550538 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/message_loop.h" -#include "chrome/browser/chromeos/extensions/file_browser_private_api.h" +#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 32af5cb..9089dca 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -735,14 +735,14 @@ # Only extension API implementations should go here. 'browser/chromeos/extensions/echo_private_api.cc', 'browser/chromeos/extensions/echo_private_api.h', - 'browser/chromeos/extensions/file_browser_private_api.cc', - 'browser/chromeos/extensions/file_browser_private_api.h', - 'browser/chromeos/extensions/file_browser_private_api_factory.cc', - 'browser/chromeos/extensions/file_browser_private_api_factory.h', 'browser/chromeos/extensions/file_manager/file_browser_handler.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler.h', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.h', + 'browser/chromeos/extensions/file_manager/file_browser_private_api.cc', + 'browser/chromeos/extensions/file_manager/file_browser_private_api.h', + 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc', + 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h', 'browser/chromeos/extensions/input_method_api.cc', 'browser/chromeos/extensions/input_method_api.h', 'browser/chromeos/extensions/media_player_api.cc', @@ -785,12 +785,12 @@ }], ['file_manager_extension==0', { 'sources/': [ - ['exclude', 'browser/chromeos/extensions/file_browser_private_api.cc'], - ['exclude', 'browser/chromeos/extensions/file_browser_private_api.h'], - ['exclude', 'browser/chromeos/extensions/file_browser_private_api_factory.cc'], - ['exclude', 'browser/chromeos/extensions/file_browser_private_api_factory.h'], ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc'], ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.h'], + ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.cc'], + ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.h'], + ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc'], + ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h'], ['exclude', 'browser/chromeos/extensions/file_manager/file_handler_util.cc'], ['exclude', 'browser/chromeos/extensions/file_manager/file_manager_util.h'], ['exclude', 'browser/chromeos/extensions/media_player_api.cc'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ea785a5..0ec665e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1166,8 +1166,8 @@ 'browser/chromeos/drive/drive_test_util.h', 'browser/chromeos/extensions/echo_private_apitest.cc', 'browser/chromeos/extensions/external_filesystem_apitest.cc', - 'browser/chromeos/extensions/file_browser_private_apitest.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc', + 'browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc', 'browser/chromeos/extensions/file_manager/file_manager_browsertest.cc', 'browser/chromeos/extensions/file_manager/file_manager_event_router_browsertest.cc', 'browser/chromeos/extensions/file_manager/file_manager_notifications_browsertest.cc', |