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 aefe220ff8b14ffeb1bba68c4cc8f09b98de16a6..8ee530e796178ad060ad9031d43e81450b1465a3 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_CHROMEOS) |
#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(OS_CHROMEOS) |
msw
2011/10/29 02:55:11
Again, shouldn't this just be "#if !defined(OS_CHR
alicet1
2011/11/02 06:51:25
dropped.
|
+ // 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( |