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

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

Issue 7057014: Variety of tweaks to View API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.cc (revision 86083)
+++ chrome/browser/ui/views/location_bar/location_bar_view.cc (working copy)
@@ -124,8 +124,8 @@
template_url_model_(NULL),
animation_offset_(0) {
DCHECK(profile_);
- SetID(VIEW_ID_LOCATION_BAR);
- SetFocusable(true);
+ set_id(VIEW_ID_LOCATION_BAR);
+ set_focusable(true);
if (mode_ == NORMAL)
painter_.reset(new views::HorizontalPainter(kNormalModeBackgroundImages));
@@ -179,7 +179,7 @@
#endif
location_entry_view_ = location_entry_->AddToView(this);
- location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
+ location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
selected_keyword_view_ = new SelectedKeywordView(
kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
@@ -502,16 +502,16 @@
kItemEditPadding);
}
- if (star_view_ && star_view_->IsVisible())
+ if (star_view_ && star_view_->visible())
entry_width -= star_view_->GetPreferredSize().width() + kItemPadding;
for (PageActionViews::const_iterator i(page_action_views_.begin());
i != page_action_views_.end(); ++i) {
- if ((*i)->IsVisible())
+ if ((*i)->visible())
entry_width -= ((*i)->GetPreferredSize().width() + kItemPadding);
}
for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
i != content_setting_views_.end(); ++i) {
- if ((*i)->IsVisible())
+ if ((*i)->visible())
entry_width -= ((*i)->GetPreferredSize().width() + kItemPadding);
}
// The gap between the edit and whatever is to its right is shortened.
@@ -572,7 +572,7 @@
// Lay out items to the right of the edit field.
int offset = width() - kEdgeThickness - kEdgeItemPadding;
- if (star_view_ && star_view_->IsVisible()) {
+ if (star_view_ && star_view_->visible()) {
int star_width = star_view_->GetPreferredSize().width();
offset -= star_width;
star_view_->SetBounds(offset, location_y, star_width, location_height);
@@ -581,7 +581,7 @@
for (PageActionViews::const_iterator i(page_action_views_.begin());
i != page_action_views_.end(); ++i) {
- if ((*i)->IsVisible()) {
+ if ((*i)->visible()) {
int page_action_width = (*i)->GetPreferredSize().width();
offset -= page_action_width;
(*i)->SetBounds(offset, location_y, page_action_width, location_height);
@@ -593,7 +593,7 @@
for (ContentSettingViews::const_reverse_iterator
i(content_setting_views_.rbegin()); i != content_setting_views_.rend();
++i) {
- if ((*i)->IsVisible()) {
+ if ((*i)->visible()) {
int content_blocked_width = (*i)->GetPreferredSize().width();
offset -= content_blocked_width;
(*i)->SetBounds(offset, location_y, content_blocked_width,
@@ -603,11 +603,11 @@
}
// Now lay out items to the left of the edit field.
- if (location_icon_view_->IsVisible()) {
+ if (location_icon_view_->visible()) {
location_icon_view_->SetBounds(kEdgeThickness + kEdgeItemPadding,
location_y, location_icon_width, location_height);
offset = location_icon_view_->bounds().right() + kItemEditPadding;
- } else if (ev_bubble_view_->IsVisible()) {
+ } else if (ev_bubble_view_->visible()) {
ev_bubble_view_->SetBounds(kEdgeThickness + kBubbleHorizontalPadding,
location_y + kBubbleVerticalPadding, ev_bubble_width,
ev_bubble_view_->GetPreferredSize().height());
@@ -625,7 +625,7 @@
0, selected_keyword_view_->GetPreferredSize().height());
LayoutView(selected_keyword_view_, kItemEditPadding, available_width,
true, &location_bounds);
- location_bounds.set_x(selected_keyword_view_->IsVisible() ?
+ location_bounds.set_x(selected_keyword_view_->visible() ?
(offset + selected_keyword_view_->width() + kItemEditPadding) :
(kEdgeThickness + kEdgeEditPadding));
} else if (show_keyword_hint) {
@@ -637,7 +637,7 @@
location_bounds.Inset(0, 0, kEditInternalSpace, 0);
LayoutView(keyword_hint_view_, kItemEditPadding, available_width, false,
&location_bounds);
- if (!keyword_hint_view_->IsVisible()) {
+ if (!keyword_hint_view_->visible()) {
// Put back the enlargement that we undid above.
location_bounds.Inset(0, 0, -kEditInternalSpace, 0);
}
@@ -881,7 +881,7 @@
view_size = view->GetMinimumSize();
int desired_width = view_size.width() + padding;
view->SetVisible(desired_width < bounds->width());
- if (view->IsVisible()) {
+ if (view->visible()) {
view->SetBounds(
leading ? bounds->x() : (bounds->right() - view_size.width()),
view->y(), view_size.width(), view->height());
@@ -915,7 +915,7 @@
std::map<ExtensionAction*, bool> old_visibility;
for (PageActionViews::const_iterator i(page_action_views_.begin());
i != page_action_views_.end(); ++i)
- old_visibility[(*i)->image_view()->page_action()] = (*i)->IsVisible();
+ old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
// Remember the previous visibility of the page actions so that we can
// notify when this changes.
@@ -954,7 +954,7 @@
// Check if the visibility of the action changed and notify if it did.
ExtensionAction* action = (*i)->image_view()->page_action();
if (old_visibility.find(action) == old_visibility.end() ||
- old_visibility[action] != (*i)->IsVisible()) {
+ old_visibility[action] != (*i)->visible()) {
NotificationService::current()->Notify(
NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
Source<ExtensionAction>(action),
@@ -1006,7 +1006,7 @@
// Return true so that the edit sees the tab and commits the suggestion.
return true;
}
- if (keyword_hint_view_->IsVisible() && !event.IsShiftDown()) {
+ if (keyword_hint_view_->visible() && !event.IsShiftDown()) {
// Return true so the edit gets the tab event and enters keyword mode.
return true;
}
@@ -1147,7 +1147,7 @@
int LocationBarView::PageActionVisibleCount() {
int result = 0;
for (size_t i = 0; i < page_action_views_.size(); i++) {
- if (page_action_views_[i]->IsVisible())
+ if (page_action_views_[i]->visible())
++result;
}
return result;
@@ -1164,7 +1164,7 @@
ExtensionAction* LocationBarView::GetVisiblePageAction(size_t index) {
size_t current = 0;
for (size_t i = 0; i < page_action_views_.size(); ++i) {
- if (page_action_views_[i]->IsVisible()) {
+ if (page_action_views_[i]->visible()) {
if (current == index)
return page_action_views_[i]->image_view()->page_action();
@@ -1179,7 +1179,7 @@
void LocationBarView::TestPageActionPressed(size_t index) {
size_t current = 0;
for (size_t i = 0; i < page_action_views_.size(); ++i) {
- if (page_action_views_[i]->IsVisible()) {
+ if (page_action_views_[i]->visible()) {
if (current == index) {
const int kLeftMouseButton = 1;
page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,

Powered by Google App Engine
This is Rietveld 408576698