Index: chrome/browser/ui/views/location_bar/location_bar_view.cc |
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 7aaa46130127971fe8d10b79b659888e5ee77b45..4eb2485d74cc5f8969a7d1a489895dfc432c0609 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
@@ -61,8 +61,11 @@ |
#include "views/controls/textfield/native_textfield_views.h" |
#include "views/drag_utils.h" |
-#if defined(OS_WIN) |
+#if defined(OS_WIN) || defined(USE_AURA) |
msw
2011/10/18 18:39:23
What's blocking this for cross-platform use?
If we
alicet1
2011/10/19 05:02:15
I think this has to do with FirstRunBubble depends
|
#include "chrome/browser/ui/views/first_run_bubble.h" |
+#endif |
+ |
+#if defined(OS_WIN) |
#include "chrome/browser/ui/views/location_bar/suggested_text_view.h" |
#endif |
@@ -1018,7 +1021,8 @@ void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) { |
void LocationBarView::ShowFirstRunBubbleInternal( |
FirstRun::BubbleType bubble_type) { |
-#if defined(OS_WIN) // First run bubble doesn't make sense for Chrome OS. |
+#if defined(OS_WIN) || (defined(USE_AURA) && !defined(OS_CHROMEOS)) |
msw
2011/10/18 18:39:23
If we just don't want it on Chrome OS, then this s
alicet1
2011/10/19 05:02:15
Done.
|
+ // First run bubble doesn't make sense for Chrome OS. |
// Point at the start of the edit control; adjust to look as good as possible. |
const int kXOffset = kNormalHorizontalEdgeThickness + kEdgeItemPadding + |
ResourceBundle::GetSharedInstance().GetBitmapNamed( |