Chromium Code Reviews| Index: chrome/browser/ui/views/location_bar/location_bar_view.cc |
| diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
| index 8a71d567653cd1638645056b894de8ececb0d4fe..4d9f4185fc70956c6b4389c744b35359e1223d90 100644 |
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
| @@ -42,6 +42,7 @@ |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| #include "chrome/browser/ui/view_ids.h" |
| #include "chrome/browser/ui/views/browser_dialogs.h" |
| +#include "chrome/browser/ui/views/location_bar/add_to_app_launcher_view.h" |
| #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" |
| #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h" |
| #include "chrome/browser/ui/views/location_bar/generated_credit_card_view.h" |
| @@ -221,6 +222,7 @@ LocationBarView::LocationBarView(Browser* browser, |
| open_pdf_in_reader_view_(NULL), |
| manage_passwords_icon_view_(NULL), |
| translate_icon_view_(NULL), |
| + add_to_app_launcher_view_(NULL), |
| star_view_(NULL), |
| search_button_(NULL), |
| is_popup_mode_(is_popup_mode), |
| @@ -389,6 +391,11 @@ void LocationBarView::Init() { |
| translate_icon_view_->SetVisible(false); |
| AddChildView(translate_icon_view_); |
| + add_to_app_launcher_view_ = new AddToAppLauncherView( |
| + this, bubble_font_list, text_color, background_color); |
| + add_to_app_launcher_view_->SetVisible(false); |
| + AddChildView(add_to_app_launcher_view_); |
| + |
| star_view_ = new StarView(command_updater()); |
| star_view_->SetVisible(false); |
| AddChildView(star_view_); |
| @@ -713,12 +720,14 @@ gfx::Size LocationBarView::GetPreferredSize() const { |
| (search_button_->GetMinimumSize().width() + kSearchButtonInset) : |
| horizontal_edge_thickness; |
| trailing_width += IncrementalMinimumWidth(star_view_) + |
| - IncrementalMinimumWidth(translate_icon_view_) + |
| - IncrementalMinimumWidth(open_pdf_in_reader_view_) + |
| - IncrementalMinimumWidth(manage_passwords_icon_view_) + |
| - IncrementalMinimumWidth(zoom_view_) + |
| - IncrementalMinimumWidth(generated_credit_card_view_) + |
| - IncrementalMinimumWidth(mic_search_view_) + kItemPadding; |
| + IncrementalMinimumWidth(translate_icon_view_) + |
| + IncrementalMinimumWidth(open_pdf_in_reader_view_) + |
| + IncrementalMinimumWidth(manage_passwords_icon_view_) + |
| + IncrementalMinimumWidth(zoom_view_) + |
| + IncrementalMinimumWidth(generated_credit_card_view_) + |
| + IncrementalMinimumWidth(mic_search_view_) + |
| + IncrementalMinimumWidth(add_to_app_launcher_view_) + |
| + kItemPadding; |
|
Peter Kasting
2014/06/11 18:20:48
Nit: The old indenting was correct
benwells
2014/06/12 03:36:35
Done.
|
| for (PageActionViews::const_iterator i(page_action_views_.begin()); |
| i != page_action_views_.end(); ++i) |
| trailing_width += IncrementalMinimumWidth((*i)); |
| @@ -803,6 +812,10 @@ void LocationBarView::Layout() { |
| trailing_decorations.AddDecoration( |
| vertical_edge_thickness(), location_height, star_view_); |
| } |
| + if (add_to_app_launcher_view_->visible()) { |
| + trailing_decorations.AddDecoration( |
| + vertical_edge_thickness(), location_height, add_to_app_launcher_view_); |
| + } |
| if (translate_icon_view_->visible()) { |
| trailing_decorations.AddDecoration( |
| vertical_edge_thickness(), location_height, translate_icon_view_); |
| @@ -1084,6 +1097,8 @@ void LocationBarView::Update(const WebContents* contents) { |
| RefreshManagePasswordsIconView(); |
| open_pdf_in_reader_view_->Update( |
| GetToolbarModel()->input_in_progress() ? NULL : GetWebContents()); |
|
Peter Kasting
2014/06/11 18:20:48
Nit: Factor this common expression out to a temp
benwells
2014/06/12 03:36:35
Done.
|
| + add_to_app_launcher_view_->Update( |
| + GetToolbarModel()->input_in_progress() ? NULL : GetWebContents()); |
| if (star_view_) { |
| star_view_->SetVisible( |