11 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
index d6a2db7..c98f06b 100644
--- a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
@@ -13,7 +13,6 @@
 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h"
 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h"
-#import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
@@ -27,6 +26,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#import "ui/base/cocoa/focus_tracker.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index c321432..1fbba59 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -19,7 +19,6 @@
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
-#import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
@@ -34,6 +33,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
+#import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/ui_base_types.h"
 
 using content::WebContents;
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index 181d0a8..b2b810f 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -12,7 +12,6 @@
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.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/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ -23,6 +22,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
+#import "ui/base/cocoa/focus_tracker.h"
 
 const float kFindBarOpenDuration = 0.2;
 const float kFindBarCloseDuration = 0.15;
diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
index 23b9e64..a4fb6f6 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -5,9 +5,9 @@
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 
 #include "base/logging.h"
-#import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
+#import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/theme_provider.h"
 
 @interface TabWindowController(PRIVATE)
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3105d96..f4b48ac 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2735,8 +2735,6 @@
         'browser/ui/cocoa/first_run_dialog.mm',
         'browser/ui/cocoa/floating_bar_backing_view.h',
         'browser/ui/cocoa/floating_bar_backing_view.mm',
-        'browser/ui/cocoa/focus_tracker.h',
-        'browser/ui/cocoa/focus_tracker.mm',
         'browser/ui/cocoa/framed_browser_window.h',
         'browser/ui/cocoa/framed_browser_window.mm',
         'browser/ui/cocoa/fullscreen_exit_bubble_controller.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b665107..51f4b02 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1844,7 +1844,6 @@
         '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',
-        'browser/ui/cocoa/focus_tracker_unittest.mm',
         'browser/ui/cocoa/framed_browser_window_unittest.mm',
         'browser/ui/cocoa/fullscreen_window_unittest.mm',
         'browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm',
diff --git a/chrome/browser/ui/cocoa/focus_tracker.h b/ui/base/cocoa/focus_tracker.h
index e7f9e65..3afe34f 100644
--- a/chrome/browser/ui/cocoa/focus_tracker.h
+++ b/ui/base/cocoa/focus_tracker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/ui/cocoa/focus_tracker.mm b/ui/base/cocoa/focus_tracker.mm
index dc52791..ef247cc 100644
--- a/chrome/browser/ui/cocoa/focus_tracker.mm
+++ b/ui/base/cocoa/focus_tracker.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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/focus_tracker.h"
+#import "ui/base/cocoa/focus_tracker.h"
 
 #include "base/basictypes.h"
 
diff --git a/chrome/browser/ui/cocoa/focus_tracker_unittest.mm b/ui/base/cocoa/focus_tracker_unittest.mm
index b4aed78..53aae6e 100644
--- a/chrome/browser/ui/cocoa/focus_tracker_unittest.mm
+++ b/ui/base/cocoa/focus_tracker_unittest.mm
@@ -1,21 +1,21 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/focus_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#import "ui/base/cocoa/focus_tracker.h"
+#import "ui/base/test/ui_cocoa_test_helper.h"
 
 namespace {
 
-class FocusTrackerTest : public CocoaTest {
+class FocusTrackerTest : public ui::CocoaTest {
  public:
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    ui::CocoaTest::SetUp();
     scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
     viewA_ = view.get();
     [[test_window() contentView] addSubview:viewA_];
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 851cec8..4234172 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -89,6 +89,8 @@
         'base/cocoa/base_view.h',
         'base/cocoa/base_view.mm',
         'base/cocoa/events_mac.mm',
+        'base/cocoa/focus_tracker.h',
+        'base/cocoa/focus_tracker.mm',
         'base/dragdrop/cocoa_dnd_util.h',
         'base/dragdrop/cocoa_dnd_util.mm',
         'base/dragdrop/drag_drop_types_gtk.cc',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index bbc56c7..bb51bbd 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -55,6 +55,7 @@
         'base/clipboard/custom_data_helper_unittest.cc',
         'base/cocoa/base_view_unittest.mm',
         'base/cocoa/events_mac_unittest.mm',
+        'base/cocoa/focus_tracker_unittest.mm',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',