Move loose extension files in c/b/ui/cocoa/ into the extensions/ subdir

BUG=none
TEST=compile
Review URL: http://codereview.chromium.org/6269009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71600 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 25 insertions, 25 deletions

diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 234a1a7..423b2db 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -18,7 +18,7 @@
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/extensions/extension_view.h"
 #elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/extension_view_mac.h"
+#include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/extension_view_gtk.h"
 #endif
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index a004e4e..c59aabc 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -33,7 +33,7 @@
 #include "grit/theme_resources.h"
 
 #if defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/extension_installed_bubble_bridge.h"
+#include "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/ui/cocoa/extension_install_prompt.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm
index 3306806..3306806 100644
--- a/chrome/browser/ui/cocoa/extension_install_prompt.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_bridge.h b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h
index 62d72c3..519365c 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_bridge.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h
@@ -5,8 +5,8 @@
 // C++ bridge function to connect ExtensionInstallUI to the Cocoa-based
 // extension installed bubble.
 
-#ifndef CHROME_BROWSER_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
-#define CHROME_BROWSER_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
+#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
 #pragma once
 
 #include "gfx/native_widget_types.h"
@@ -25,4 +25,4 @@ void ShowExtensionInstalledBubble(gfx::NativeWindow window,
                                   SkBitmap icon);
 }
 
-#endif  // CHROME_BROWSER_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
+#endif  // CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
index d439899..ce201e0 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_bridge.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
@@ -4,9 +4,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "extension_installed_bubble_bridge.h"
+#import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h"
 
-#import "chrome/browser/ui/cocoa/extension_installed_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
 
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h
index 63dfc22..dfcb8c0 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.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_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -109,4 +109,4 @@ typedef enum {
 
 @end  // ExtensionInstalledBubbleController(ExposedForTesting)
 
-#endif  // CHROME_BROWSER_UI_COCOA_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_CONTROLLER_H_
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
index ad30096..2e83556 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "extension_installed_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index f1171d1..1cafd26 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -13,7 +13,7 @@
 #import "chrome/browser/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/extension_installed_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 7404c3d..0a188ae 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -12,7 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
-#import "chrome/browser/ui/cocoa/extension_view_mac.h"
+#import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/cocoa/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
index 43e9058..6254d6e 100644
--- a/chrome/browser/ui/cocoa/extension_view_mac.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.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_UI_COCOA_EXTENSION_VIEW_MAC_H_
-#define CHROME_BROWSER_UI_COCOA_EXTENSION_VIEW_MAC_H_
+#ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_VIEW_MAC_H_
+#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_VIEW_MAC_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -85,4 +85,4 @@ class ExtensionViewMac {
   DISALLOW_COPY_AND_ASSIGN(ExtensionViewMac);
 };
 
-#endif  // CHROME_BROWSER_UI_COCOA_EXTENSION_VIEW_MAC_H_
+#endif  // CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_VIEW_MAC_H_
diff --git a/chrome/browser/ui/cocoa/extension_view_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm
index d3a10e7..e878231 100644
--- a/chrome/browser/ui/cocoa/extension_view_mac.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm
@@ -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/ui/cocoa/extension_view_mac.h"
+#include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0d61ce7..3aa1503 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2796,13 +2796,6 @@
         'browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm',
         'browser/ui/cocoa/event_utils.h',
         'browser/ui/cocoa/event_utils.mm',
-        'browser/ui/cocoa/extension_install_prompt.mm',
-        'browser/ui/cocoa/extension_installed_bubble_bridge.h',
-        'browser/ui/cocoa/extension_installed_bubble_bridge.mm',
-        'browser/ui/cocoa/extension_installed_bubble_controller.h',
-        'browser/ui/cocoa/extension_installed_bubble_controller.mm',
-        'browser/ui/cocoa/extension_view_mac.h',
-        'browser/ui/cocoa/extension_view_mac.mm',
         'browser/ui/cocoa/extensions/browser_action_button.h',
         'browser/ui/cocoa/extensions/browser_action_button.mm',
         'browser/ui/cocoa/extensions/browser_actions_container_view.h',
@@ -2819,8 +2812,15 @@
         'browser/ui/cocoa/extensions/extension_infobar_controller.mm',
         'browser/ui/cocoa/extensions/extension_install_prompt_controller.h',
         'browser/ui/cocoa/extensions/extension_install_prompt_controller.mm',
+        'browser/ui/cocoa/extensions/extension_install_prompt.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.h',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm',
         'browser/ui/cocoa/extensions/extension_popup_controller.h',
         'browser/ui/cocoa/extensions/extension_popup_controller.mm',
+        'browser/ui/cocoa/extensions/extension_view_mac.h',
+        'browser/ui/cocoa/extensions/extension_view_mac.mm',
         'browser/ui/cocoa/external_protocol_dialog.h',
         'browser/ui/cocoa/external_protocol_dialog.mm',
         'browser/ui/cocoa/fast_resize_view.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 86c77ce..68edf07 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1497,10 +1497,10 @@
         'browser/ui/cocoa/download/download_util_mac_unittest.mm',
         'browser/ui/cocoa/draggable_button_unittest.mm',
         'browser/ui/cocoa/event_utils_unittest.mm',
-        'browser/ui/cocoa/extension_installed_bubble_controller_unittest.mm',
         'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm',
         'browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm',
         'browser/ui/cocoa/extensions/extension_install_prompt_controller_unittest.mm',
+        'browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm',
         'browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm',
         'browser/ui/cocoa/fast_resize_view_unittest.mm',
         'browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm',