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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10830254: views: Pass only Browser pointer to FirstRunBubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 ConvertPointToScreen(this, &screen_point); 1178 ConvertPointToScreen(this, &screen_point);
1179 omnibox_win->HandleExternalMsg(msg, flags, screen_point.ToPOINT()); 1179 omnibox_win->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
1180 } 1180 }
1181 } 1181 }
1182 #endif 1182 #endif
1183 1183
1184 void LocationBarView::ShowFirstRunBubbleInternal() { 1184 void LocationBarView::ShowFirstRunBubbleInternal() {
1185 #if !defined(OS_CHROMEOS) 1185 #if !defined(OS_CHROMEOS)
1186 // First run bubble doesn't make sense for Chrome OS. 1186 // First run bubble doesn't make sense for Chrome OS.
1187 Browser* browser = GetBrowserFromDelegate(delegate_); 1187 Browser* browser = GetBrowserFromDelegate(delegate_);
1188 FirstRunBubble::ShowBubble(browser, profile_, location_icon_view_); 1188 FirstRunBubble::ShowBubble(browser, location_icon_view_);
1189 #endif 1189 #endif
1190 } 1190 }
1191 1191
1192 void LocationBarView::PaintActionBoxBackground(gfx::Canvas* canvas, 1192 void LocationBarView::PaintActionBoxBackground(gfx::Canvas* canvas,
1193 const gfx::Rect& content_rect) { 1193 const gfx::Rect& content_rect) {
1194 // Draw action box background here so we can fill it up to the right hand 1194 // Draw action box background here so we can fill it up to the right hand
1195 // location bar border without any gap. 1195 // location bar border without any gap.
1196 gfx::Rect bounds(content_rect); 1196 gfx::Rect bounds(content_rect);
1197 // Fill button rectangle. 1197 // Fill button rectangle.
1198 int action_box_button_x = action_box_button_view_->bounds().x(); 1198 int action_box_button_x = action_box_button_view_->bounds().x();
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 } 1499 }
1500 1500
1501 void LocationBarView::CleanupFadeAnimation() { 1501 void LocationBarView::CleanupFadeAnimation() {
1502 // Since we're no longer animating we don't need our layer. 1502 // Since we're no longer animating we don't need our layer.
1503 SetPaintToLayer(false); 1503 SetPaintToLayer(false);
1504 // Bubble labels don't need a transparent background anymore. 1504 // Bubble labels don't need a transparent background anymore.
1505 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1505 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1506 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1506 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1507 } 1507 }
1508 #endif // USE_AURA 1508 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698