chromeos: Move remaining file manager related files from chrome/brows…

…er/chromeos/extensions Move files to a sub directory. Move owners to an appropriate place. BUG=224200 TEST=build Review URL: https://codereview.chromium.org/14252002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194293 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Apr 16, 2013 · 3a0a670 · 3a0a670
1 parent cffb6f9
commit 3a0a670
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 29 deletions.
diff --git a/chrome/browser/chromeos/extensions/OWNERS b/chrome/browser/chromeos/extensions/OWNERS
@@ -13,16 +13,8 @@ mpcomplete@chromium.org
 yoz@chromium.org
 
 # Additional ChromeOS-specific reviewers
-achuith@chromium.org
-# bshe for wallpaper related files
-bshe@chromium.org
-dgozman@chromium.org
-hashimoto@chromium.org
-hshi@chromium.org
-kaznacheev@chromium.org
-oleg@chromium.org
-satorux@chromium.org
-serya@chromium.org
 tbarzic@chromium.org
 zelidrag@chromium.org
-zvorygin@chromium.org
+
+# bshe for wallpaper related files
+bshe@chromium.org
diff --git a/chrome/browser/chromeos/extensions/file_manager/OWNERS b/chrome/browser/chromeos/extensions/file_manager/OWNERS
@@ -0,0 +1,11 @@
+achuith@chromium.org
+dgozman@chromium.org
+hashimoto@chromium.org
+hshi@chromium.org
+kaznacheev@chromium.org
+oleg@chromium.org
+satorux@chromium.org
+serya@chromium.org
+tbarzic@chromium.org
+zelidrag@chromium.org
+zvorygin@chromium.org
diff --git a/...er/chromeos/extensions/drive_test_util.cc → ...xtensions/file_manager/drive_test_util.cc b/...er/chromeos/extensions/drive_test_util.cc → ...xtensions/file_manager/drive_test_util.cc
diff --git a/...ser/chromeos/extensions/drive_test_util.h → ...extensions/file_manager/drive_test_util.h b/...ser/chromeos/extensions/drive_test_util.h → ...extensions/file_manager/drive_test_util.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_DRIVE_TEST_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_DRIVE_TEST_UTIL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_DRIVE_TEST_UTIL_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_DRIVE_TEST_UTIL_H_
 
 class Profile;
 
@@ -16,4 +16,4 @@ void WaitUntilDriveMountPointIsAdded(Profile* profile);
 
 }  // namespace drive_test_util
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_DRIVE_TEST_UTIL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_DRIVE_TEST_UTIL_H_
diff --git a/...extensions/external_filesystem_apitest.cc → ...le_manager/external_filesystem_apitest.cc b/...extensions/external_filesystem_apitest.cc → ...le_manager/external_filesystem_apitest.cc
@@ -14,7 +14,7 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive_file_system.h"
 #include "chrome/browser/chromeos/drive/drive_system_service.h"
-#include "chrome/browser/chromeos/extensions/drive_test_util.h"
+#include "chrome/browser/chromeos/extensions/file_manager/drive_test_util.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
@@ -35,7 +35,7 @@
 #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"
+#include "chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h
@@ -17,7 +17,7 @@
 #include "chrome/browser/chromeos/drive/drive_file_error.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h"
-#include "chrome/browser/chromeos/extensions/zip_file_creator.h"
+#include "chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "googleurl/src/url_util.h"

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/chromeos/drive/drive_file_system.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "chrome/browser/chromeos/drive/drive_system_service.h"
-#include "chrome/browser/chromeos/extensions/drive_test_util.h"
+#include "chrome/browser/chromeos/extensions/file_manager/drive_test_util.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"

diff --git a/...r/chromeos/extensions/zip_file_creator.cc → ...tensions/file_manager/zip_file_creator.cc b/...r/chromeos/extensions/zip_file_creator.cc → ...tensions/file_manager/zip_file_creator.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/zip_file_creator.h"
+#include "chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"

diff --git a/...er/chromeos/extensions/zip_file_creator.h → ...xtensions/file_manager/zip_file_creator.h b/...er/chromeos/extensions/zip_file_creator.h → ...xtensions/file_manager/zip_file_creator.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_ZIP_FILE_CREATOR_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_ZIP_FILE_CREATOR_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_ZIP_FILE_CREATOR_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_ZIP_FILE_CREATOR_H_
 
 #include <string>
 
@@ -91,4 +91,4 @@ class ZipFileCreator : public content::UtilityProcessHostClient {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_ZIP_FILE_CREATOR_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_ZIP_FILE_CREATOR_H_
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
@@ -743,6 +743,8 @@
             '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/file_manager/zip_file_creator.cc',
+            'browser/chromeos/extensions/file_manager/zip_file_creator.h',
             'browser/chromeos/extensions/input_method_api.cc',
             'browser/chromeos/extensions/input_method_api.h',
             'browser/chromeos/extensions/media_player_api.cc',
@@ -757,8 +759,6 @@
             'browser/chromeos/extensions/wallpaper_manager_util.h',
             'browser/chromeos/extensions/wallpaper_private_api.cc',
             'browser/chromeos/extensions/wallpaper_private_api.h',
-            'browser/chromeos/extensions/zip_file_creator.cc',
-            'browser/chromeos/extensions/zip_file_creator.h',
           ],
         }],
         ['use_cras==1', {
@@ -793,10 +793,10 @@
             ['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/file_manager/zip_file_creator.cc'],
+            ['exclude', 'browser/chromeos/extensions/file_manager/zip_file_creator.h'],
             ['exclude', 'browser/chromeos/extensions/media_player_api.cc'],
             ['exclude', 'browser/chromeos/extensions/media_player_api.h'],
-            ['exclude', 'browser/chromeos/extensions/zip_file_creator.cc'],
-            ['exclude', 'browser/chromeos/extensions/zip_file_creator.h'],
           ],
         }],
         ['use_ash==1', {

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -1164,10 +1164,10 @@
         'browser/chromeos/drive/drive_system_service_browsertest.cc',
         'browser/chromeos/drive/drive_test_util.cc',
         'browser/chromeos/drive/drive_test_util.h',
-        'browser/chromeos/extensions/drive_test_util.cc',
-        'browser/chromeos/extensions/drive_test_util.h',
         'browser/chromeos/extensions/echo_private_apitest.cc',
-        'browser/chromeos/extensions/external_filesystem_apitest.cc',
+        'browser/chromeos/extensions/file_manager/drive_test_util.cc',
+        'browser/chromeos/extensions/file_manager/drive_test_util.h',
+        'browser/chromeos/extensions/file_manager/external_filesystem_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',