[Mac] Move the associated find bar files into a subdir of c/b/ui/cocoa/

BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/6366001

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

19 files changed, 42 insertions, 42 deletions

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 1ecb494..0aedbad 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -35,8 +35,8 @@
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
-#import "chrome/browser/ui/cocoa/find_bar_bridge.h"
-#import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index d16401f..4351532 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/ui/cocoa/find_bar_bridge.h"
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_bridge.h b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h
index 2b8d83b..217c2cb 100644
--- a/chrome/browser/ui/cocoa/find_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.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_FIND_BAR_BRIDGE_H_
-#define CHROME_BROWSER_UI_COCOA_FIND_BAR_BRIDGE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_BRIDGE_H_
+#define CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_BRIDGE_H_
 #pragma once
 
 #include "base/logging.h"
@@ -94,4 +94,4 @@ class FindBarBridge : public FindBar,
   DISALLOW_COPY_AND_ASSIGN(FindBarBridge);
 };
 
-#endif  // CHROME_BROWSER_UI_COCOA_FIND_BAR_BRIDGE_H_
+#endif  // CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/find_bar_bridge.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm
index 9481b54..3384b2c 100644
--- a/chrome/browser/ui/cocoa/find_bar_bridge.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.mm
@@ -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/ui/cocoa/find_bar_bridge.h"
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 
 #include "base/sys_string_conversions.h"
-#import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 
 // static
 bool FindBarBridge::disable_animations_during_testing_ = false;
diff --git a/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm
index 421cb80..10c13bd 100644
--- a/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/ui/cocoa/find_bar_bridge.h"
+#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 
 namespace {
diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.h b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h
index 289d89c..548b1ba 100644
--- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 
 #include "base/scoped_nsobject.h"
 #include "base/string16.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index f8a40442..230f91c 100644
--- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -9,10 +9,10 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
-#import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
-#import "chrome/browser/ui/cocoa/find_bar_bridge.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/find_pasteboard.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/tab_strip_controller.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm
index d7869c2..b3a638998 100644
--- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm
@@ -6,9 +6,9 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_window.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/find_pasteboard.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field.h b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h
index 765cc64..765cc64 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field.mm
index 805fca3..eabfc70 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field.mm
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/find_bar_text_field.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
 
 #include "base/logging.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 
 @implementation FindBarTextField
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field_cell.h b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h
index ee6785f..ee6785f 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field_cell.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field_cell.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm
index 3f93766..d855b0d 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field_cell.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.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 "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm
index 1448632..c65431c 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm
index 382a870..836a82b 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm
@@ -6,8 +6,8 @@
 
 #import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field.h"
-#import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_view.h b/chrome/browser/ui/cocoa/find_bar/find_bar_view.h
index ff5753d..a3cc96b 100644
--- a/chrome/browser/ui/cocoa/find_bar_view.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view.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_FIND_BAR_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_FIND_BAR_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -16,4 +16,4 @@
 }
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_FIND_BAR_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/find_bar_view.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_view.mm
index 5e1ce21..7883a1f 100644
--- a/chrome/browser/ui/cocoa/find_bar_view.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view.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 "chrome/browser/ui/cocoa/find_bar_view.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_view.h"
 
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_view_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm
index 639b5ef..ce80bec 100644
--- a/chrome/browser/ui/cocoa/find_bar_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm
@@ -6,7 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/find_bar_view.h"
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_view.h"
 #include "chrome/browser/ui/cocoa/test_event_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4452118..8327a1c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2824,16 +2824,16 @@
         'browser/ui/cocoa/fast_resize_view.mm',
         'browser/ui/cocoa/file_metadata.h',
         'browser/ui/cocoa/file_metadata.mm',
-        'browser/ui/cocoa/find_bar_bridge.h',
-        'browser/ui/cocoa/find_bar_bridge.mm',
-        'browser/ui/cocoa/find_bar_cocoa_controller.h',
-        'browser/ui/cocoa/find_bar_cocoa_controller.mm',
-        'browser/ui/cocoa/find_bar_text_field.h',
-        'browser/ui/cocoa/find_bar_text_field.mm',
-        'browser/ui/cocoa/find_bar_text_field_cell.h',
-        'browser/ui/cocoa/find_bar_text_field_cell.mm',
-        'browser/ui/cocoa/find_bar_view.h',
-        'browser/ui/cocoa/find_bar_view.mm',
+        'browser/ui/cocoa/find_bar/find_bar_bridge.h',
+        'browser/ui/cocoa/find_bar/find_bar_bridge.mm',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.h',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm',
+        'browser/ui/cocoa/find_bar/find_bar_view.h',
+        'browser/ui/cocoa/find_bar/find_bar_view.mm',
         'browser/ui/cocoa/find_pasteboard.h',
         'browser/ui/cocoa/find_pasteboard.mm',
         'browser/ui/cocoa/first_run_bubble_controller.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3840d5e..a5e17c2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1502,11 +1502,11 @@
         'browser/ui/cocoa/extensions/extension_install_prompt_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_bridge_unittest.mm',
-        'browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm',
-        'browser/ui/cocoa/find_bar_text_field_cell_unittest.mm',
-        'browser/ui/cocoa/find_bar_text_field_unittest.mm',
-        'browser/ui/cocoa/find_bar_view_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm',
+        'browser/ui/cocoa/find_bar/find_bar_view_unittest.mm',
         'browser/ui/cocoa/find_pasteboard_unittest.mm',
         'browser/ui/cocoa/first_run_bubble_controller_unittest.mm',
         'browser/ui/cocoa/floating_bar_backing_view_unittest.mm',