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

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

Issue 10985069: [test fixlet] Add tests for the zoom icon in the location bar on GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add todo Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/view_ids.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/command_line.h" 10 #include "base/command_line.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 kCSBubbleBackgroundImages, this, 302 kCSBubbleBackgroundImages, this,
303 font_, 303 font_,
304 GetColor(instant_extended_api_enabled_, 304 GetColor(instant_extended_api_enabled_,
305 ToolbarModel::NONE, TEXT)); 305 ToolbarModel::NONE, TEXT));
306 content_setting_views_.push_back(content_blocked_view); 306 content_setting_views_.push_back(content_blocked_view);
307 AddChildView(content_blocked_view); 307 AddChildView(content_blocked_view);
308 content_blocked_view->SetVisible(false); 308 content_blocked_view->SetVisible(false);
309 } 309 }
310 310
311 zoom_view_ = new ZoomView(model_, delegate_); 311 zoom_view_ = new ZoomView(model_, delegate_);
312 zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON);
312 AddChildView(zoom_view_); 313 AddChildView(zoom_view_);
313 314
314 web_intents_button_view_ = 315 web_intents_button_view_ =
315 new WebIntentsButtonView(this, kWIBubbleBackgroundImages, font_, 316 new WebIntentsButtonView(this, kWIBubbleBackgroundImages, font_,
316 GetColor(instant_extended_api_enabled_, 317 GetColor(instant_extended_api_enabled_,
317 ToolbarModel::NONE, TEXT)); 318 ToolbarModel::NONE, TEXT));
318 AddChildView(web_intents_button_view_); 319 AddChildView(web_intents_button_view_);
319 320
320 open_pdf_in_reader_view_ = new OpenPDFInReaderView(this); 321 open_pdf_in_reader_view_ = new OpenPDFInReaderView(this);
321 AddChildView(open_pdf_in_reader_view_); 322 AddChildView(open_pdf_in_reader_view_);
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 } 1677 }
1677 1678
1678 void LocationBarView::CleanupFadeAnimation() { 1679 void LocationBarView::CleanupFadeAnimation() {
1679 // Since we're no longer animating we don't need our layer. 1680 // Since we're no longer animating we don't need our layer.
1680 SetPaintToLayer(false); 1681 SetPaintToLayer(false);
1681 // Bubble labels don't need a transparent background anymore. 1682 // Bubble labels don't need a transparent background anymore.
1682 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1683 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1683 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1684 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1684 } 1685 }
1685 #endif // USE_AURA 1686 #endif // USE_AURA
OLDNEW
« no previous file with comments | « chrome/browser/ui/view_ids.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698