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

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

Issue 10887029: Only show chrome2mobile in action box if it is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/command_line.h" 10 #include "base/command_line.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 AddChildView(zoom_view_); 289 AddChildView(zoom_view_);
290 290
291 if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) { 291 if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
292 // Note: condition above means that the star icon is hidden in popups and in 292 // Note: condition above means that the star icon is hidden in popups and in
293 // the app launcher. 293 // the app launcher.
294 star_view_ = new StarView(command_updater_); 294 star_view_ = new StarView(command_updater_);
295 AddChildView(star_view_); 295 AddChildView(star_view_);
296 star_view_->SetVisible(true); 296 star_view_->SetVisible(true);
297 } 297 }
298 if (ActionBoxButtonView::IsActionBoxEnabled() && browser_) { 298 if (ActionBoxButtonView::IsActionBoxEnabled() && browser_) {
299 action_box_button_view_ = new ActionBoxButtonView(browser_, profile_); 299 action_box_button_view_ = new ActionBoxButtonView(browser_);
300 AddChildView(action_box_button_view_); 300 AddChildView(action_box_button_view_);
301 if (star_view_) 301 if (star_view_)
302 star_view_->SetVisible(false); 302 star_view_->SetVisible(false);
303 } 303 }
304 304
305 registrar_.Add(this, 305 registrar_.Add(this,
306 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED, 306 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
307 content::Source<Profile>(profile_)); 307 content::Source<Profile>(profile_));
308 308
309 // Initialize the location entry. We do this to avoid a black flash which is 309 // Initialize the location entry. We do this to avoid a black flash which is
(...skipping 1189 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