9 files changed, 23 insertions, 40 deletions
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index e816d78..01db01e 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -54,7 +54,6 @@
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index e7d9fb8..12345a3 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -20,7 +20,6 @@
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
index ae9ae4f..1e01d9b 100644
--- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
@@ -6,7 +6,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
+#include "chrome/browser/ui/location_bar/location_bar_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/omnibox/location_bar_util.cc b/chrome/browser/ui/location_bar/location_bar_util.cc
index 42a24f5..23b6b5d 100644
--- a/chrome/browser/ui/omnibox/location_bar_util.cc
+++ b/chrome/browser/ui/location_bar/location_bar_util.cc
@@ -1,18 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
+#include "chrome/browser/ui/location_bar/location_bar_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_action.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/color_utils.h"
-#include "ui/gfx/rect.h"
 #include "ui/gfx/text_elider.h"
 
 namespace location_bar_util {
diff --git a/chrome/browser/ui/location_bar/location_bar_util.h b/chrome/browser/ui/location_bar/location_bar_util.h
new file mode 100644
index 0000000..a408369
--- /dev/null
+++ b/chrome/browser/ui/location_bar/location_bar_util.h
@@ -0,0 +1,17 @@
+// Copyright 2014 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 CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_UTIL_H_
+#define CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_UTIL_H_
+
+#include "base/strings/string16.h"
+
+namespace location_bar_util {
+
+// Build a short string to use in keyword-search when the field isn't very big.
+base::string16 CalculateMinString(const base::string16& description);
+
+}  // namespace location_bar_util
+
+#endif  // CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_UTIL_H_
diff --git a/chrome/browser/ui/omnibox/location_bar_util.h b/chrome/browser/ui/omnibox/location_bar_util.h
deleted file mode 100644
index 08c9240..0000000
--- a/chrome/browser/ui/omnibox/location_bar_util.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_
-#define CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_
-
-#include "base/strings/string16.h"
-#include "third_party/skia/include/core/SkColor.h"
-
-class ExtensionAction;
-
-namespace gfx {
-class Canvas;
-class Rect;
-}
-
-namespace location_bar_util {
-
-// Build a short string to use in keyword-search when the field isn't very big.
-  base::string16 CalculateMinString(const base::string16& description);
-
-}  // namespace location_bar_util
-
-#endif  // CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 6869712..04a32bc 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -33,7 +33,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
index baa0579..e7baefd 100644
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/ui/omnibox/location_bar_util.h"
+#include "chrome/browser/ui/location_bar/location_bar_util.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 33c0593..1a6a0f5 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1443,14 +1443,14 @@
       'browser/ui/fullscreen/fullscreen_controller.h',
       'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc',
       'browser/ui/fullscreen/fullscreen_exit_bubble_type.h',
+      'browser/ui/location_bar/location_bar_util.cc',
+      'browser/ui/location_bar/location_bar_util.h',
       'browser/ui/ntp_background_util.cc',
       'browser/ui/ntp_background_util.h',
       'browser/ui/omnibox/alternate_nav_infobar_delegate.cc',
       'browser/ui/omnibox/alternate_nav_infobar_delegate.h',
       'browser/ui/omnibox/location_bar.cc',
       'browser/ui/omnibox/location_bar.h',
-      'browser/ui/omnibox/location_bar_util.cc',
-      'browser/ui/omnibox/location_bar_util.h',
       'browser/ui/omnibox/omnibox_controller.cc',
       'browser/ui/omnibox/omnibox_controller.h',
       'browser/ui/omnibox/omnibox_current_page_delegate.h',