Move HyperlinkButtonCell to /ui/base/cocoa/controls.

Allows Cocoa UI code outside of chrome/browser to use it.

This is a precursor to http://crrev.com/18326006

BUG=138633
TEST=No functional changes.

Review URL: https://chromiumcodereview.appspot.com/18355002

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

19 files changed, 39 insertions, 22 deletions

diff --git a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm
index 35111d2..ff07b74 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm
@@ -9,10 +9,10 @@
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 #import "chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
index d4717cb..5843db4 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
@@ -8,10 +8,10 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/mock_autofill_dialog_controller.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/models/simple_menu_model.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm
index 9989f83..581cac3 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm
@@ -13,7 +13,6 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "skia/ext/skia_utils_mac.h"
 
 namespace {
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm
index e535d41..d573fbb 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm
@@ -5,7 +5,6 @@
 #import "chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.h"
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
index 26e5ec9..e9baf59 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
@@ -13,13 +13,13 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/cocoa_event_utils.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
index 153efc4..05304e8 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
@@ -12,10 +12,10 @@
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest_mac.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/test/cocoa_test_event_utils.h"
 
 class AvatarMenuBubbleControllerTest : public CocoaTest {
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index 5040e5b..6606e1a 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -12,7 +12,6 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ -21,6 +20,7 @@
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::PluginService;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
index 5e5af3c..4e69bdd 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
@@ -13,12 +13,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #import "chrome/browser/ui/chrome_style.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
diff --git a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
index 367556b..51087ef 100644
--- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
+++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm
@@ -16,7 +16,6 @@
 #import "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
@@ -26,6 +25,7 @@
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
index 0662eb8..411ffff 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
index b66584f..6a174c7 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -14,7 +14,6 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
@@ -29,6 +28,7 @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 15d9e44..c88958b 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -682,8 +682,6 @@
         'browser/ui/cocoa/hover_close_button.mm',
         'browser/ui/cocoa/hung_renderer_controller.h',
         'browser/ui/cocoa/hung_renderer_controller.mm',
-        'browser/ui/cocoa/hyperlink_button_cell.h',
-        'browser/ui/cocoa/hyperlink_button_cell.mm',
         'browser/ui/cocoa/hyperlink_text_view.h',
         'browser/ui/cocoa/hyperlink_text_view.mm',
         'browser/ui/cocoa/image_button_cell.h',
diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp
index 1c37840..8949533 100644
--- a/chrome/chrome_nibs.gyp
+++ b/chrome/chrome_nibs.gyp
@@ -41,6 +41,8 @@
         '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.mm',
         '../ui/base/cocoa/base_view.h',
         '../ui/base/cocoa/base_view.mm',
+        '../ui/base/cocoa/controls/hyperlink_button_cell.h',
+        '../ui/base/cocoa/controls/hyperlink_button_cell.mm',
         '../ui/base/cocoa/hover_button.h',
         '../ui/base/cocoa/hover_button.mm',
         '../ui/base/cocoa/hover_image_button.h',
@@ -161,8 +163,6 @@
         'browser/ui/cocoa/hover_close_button.mm',
         'browser/ui/cocoa/hung_renderer_controller.h',
         'browser/ui/cocoa/hung_renderer_controller.mm',
-        'browser/ui/cocoa/hyperlink_button_cell.h',
-        'browser/ui/cocoa/hyperlink_button_cell.mm',
         'browser/ui/cocoa/image_button_cell.h',
         'browser/ui/cocoa/image_button_cell.mm',
         'browser/ui/cocoa/info_bubble_view.h',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2c981c4..057cef5 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1442,7 +1442,6 @@
         'browser/ui/cocoa/history_overlay_controller_unittest.mm',
         'browser/ui/cocoa/hover_close_button_unittest.mm',
         'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
-        'browser/ui/cocoa/hyperlink_button_cell_unittest.mm',
         'browser/ui/cocoa/hyperlink_text_view_unittest.mm',
         'browser/ui/cocoa/image_button_cell_unittest.mm',
         'browser/ui/cocoa/info_bubble_view_unittest.mm',
diff --git a/chrome/browser/ui/cocoa/hyperlink_button_cell.h b/ui/base/cocoa/controls/hyperlink_button_cell.h
index 1cdc263..944f0ed 100644
--- a/chrome/browser/ui/cocoa/hyperlink_button_cell.h
+++ b/ui/base/cocoa/controls/hyperlink_button_cell.h
@@ -1,9 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
+#ifndef UI_BASE_COCOA_CONTROLS_HYPERLINK_BUTTON_CELL_H_
+#define UI_BASE_COCOA_CONTROLS_HYPERLINK_BUTTON_CELL_H_
+
 #import <Cocoa/Cocoa.h>
+
 #include "base/mac/scoped_nsobject.h"
+#include "ui/base/ui_export.h"
 
 // A HyperlinkButtonCell is used to create an NSButton that looks and acts
 // like a hyperlink. The default styling is to look like blue, underlined text
@@ -15,6 +20,10 @@
 //  3. In the Identity panel of the inspector, set the custom class to this.
 //  4. In the Attributes panel, change the Bezel to Square.
 //  5. In the Size panel, set the Height to 16.
+//
+// Use this if all of your text is a link. If you need text that contains
+// embedded links but also regular text, use HyperlinkTextView.
+UI_EXPORT
 @interface HyperlinkButtonCell : NSButtonCell {
   base::scoped_nsobject<NSColor> textColor_;
   BOOL shouldUnderline_;
@@ -35,3 +44,5 @@
 @interface HyperlinkButtonCell (ExposedForTesting)
 - (NSDictionary*)linkAttributes;
 @end
+
+#endif  // UI_BASE_COCOA_CONTROLS_HYPERLINK_BUTTON_CELL_H_
diff --git a/chrome/browser/ui/cocoa/hyperlink_button_cell.mm b/ui/base/cocoa/controls/hyperlink_button_cell.mm
index 49f316c..c723b03 100644
--- a/chrome/browser/ui/cocoa/hyperlink_button_cell.mm
+++ b/ui/base/cocoa/controls/hyperlink_button_cell.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/hyperlink_button_cell.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 
 @interface HyperlinkButtonCell ()
 - (void)customizeButtonCell;
diff --git a/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm b/ui/base/cocoa/controls/hyperlink_button_cell_unittest.mm
index 18abc03..479141b 100644
--- a/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm
+++ b/ui/base/cocoa/controls/hyperlink_button_cell_unittest.mm
@@ -1,15 +1,20 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "ui/base/cocoa/controls/hyperlink_button_cell.h"
+
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#import "ui/base/test/ui_cocoa_test_helper.h"
+
+namespace ui {
+
+namespace {
 
 class HyperlinkButtonCellTest : public CocoaTest {
  public:
@@ -109,3 +114,7 @@ TEST_F(HyperlinkButtonCellTest, UnderlineOnHover) {
   [cell_ mouseExited:nil];
   EXPECT_FALSE(HasUnderlineAttribute([cell_ linkAttributes]));
 }
+
+}  // namespace
+
+}  // namespace ui
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 9d32f55..dcc2aeb 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -105,6 +105,8 @@
         'base/cocoa/controls/hover_image_menu_button.mm',
         'base/cocoa/controls/hover_image_menu_button_cell.h',
         'base/cocoa/controls/hover_image_menu_button_cell.mm',
+        'base/cocoa/controls/hyperlink_button_cell.h',
+        'base/cocoa/controls/hyperlink_button_cell.mm',
         'base/cocoa/events_mac.mm',
         'base/cocoa/find_pasteboard.h',
         'base/cocoa/find_pasteboard.mm',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index e9b61c9..75ca785 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -141,6 +141,7 @@
         'base/cocoa/base_view_unittest.mm',
         'base/cocoa/cocoa_event_utils_unittest.mm',
         'base/cocoa/controls/hover_image_menu_button_unittest.mm',
+        'base/cocoa/controls/hyperlink_button_cell_unittest.mm',
         'base/cocoa/events_mac_unittest.mm',
         'base/cocoa/focus_tracker_unittest.mm',
         'base/cocoa/fullscreen_window_manager_unittest.mm',