Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 8265005: first run bubble using the views/bubble api. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix defines. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..7357787603e9277a76c88f6d354de552a1d25ddb 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(OS_CHROMEOS)
msw 2011/10/20 19:17:50 Shouldn't this just be: "#if !defined(OS_CHROMEOS)
alicet1 2011/10/21 19:13:16 Done.
#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/20 19:17:50 Ditto, shouldn't this just be: "#if !defined(OS_CH
+ // 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(

Powered by Google App Engine
This is Rietveld 408576698