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

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

Issue 10821114: Refactor the content setting view to allow a subclass for the web intents button. (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 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 view->SetBounds( 1107 view->SetBounds(
1108 leading ? bounds->x() : (bounds->right() - view_size.width()), 1108 leading ? bounds->x() : (bounds->right() - view_size.width()),
1109 view->y(), view_size.width(), view->height()); 1109 view->y(), view_size.width(), view->height());
1110 bounds->set_width(bounds->width() - desired_width); 1110 bounds->set_width(bounds->width() - desired_width);
1111 } 1111 }
1112 } 1112 }
1113 1113
1114 void LocationBarView::RefreshContentSettingViews() { 1114 void LocationBarView::RefreshContentSettingViews() {
1115 for (ContentSettingViews::const_iterator i(content_setting_views_.begin()); 1115 for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
1116 i != content_setting_views_.end(); ++i) { 1116 i != content_setting_views_.end(); ++i) {
1117 (*i)->UpdateFromWebContents(model_->input_in_progress() ? NULL : 1117 (*i)->Update(model_->input_in_progress() ? NULL : GetTabContents());
1118 GetWebContentsFromDelegate(delegate_));
1119 } 1118 }
1120 } 1119 }
1121 1120
1122 void LocationBarView::DeletePageActionViews() { 1121 void LocationBarView::DeletePageActionViews() {
1123 for (PageActionViews::const_iterator i(page_action_views_.begin()); 1122 for (PageActionViews::const_iterator i(page_action_views_.begin());
1124 i != page_action_views_.end(); ++i) 1123 i != page_action_views_.end(); ++i)
1125 RemoveChildView(*i); 1124 RemoveChildView(*i);
1126 STLDeleteElements(&page_action_views_); 1125 STLDeleteElements(&page_action_views_);
1127 } 1126 }
1128 1127
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 } 1524 }
1526 1525
1527 void LocationBarView::CleanupFadeAnimation() { 1526 void LocationBarView::CleanupFadeAnimation() {
1528 // Since we're no longer animating we don't need our layer. 1527 // Since we're no longer animating we don't need our layer.
1529 SetPaintToLayer(false); 1528 SetPaintToLayer(false);
1530 // Bubble labels don't need a transparent background anymore. 1529 // Bubble labels don't need a transparent background anymore.
1531 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1530 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1532 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1531 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1533 } 1532 }
1534 #endif // USE_AURA 1533 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698