OLD | NEW |
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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 generated_credit_card_view_ = new GeneratedCreditCardView(delegate_); | 371 generated_credit_card_view_ = new GeneratedCreditCardView(delegate_); |
372 AddChildView(generated_credit_card_view_); | 372 AddChildView(generated_credit_card_view_); |
373 | 373 |
374 zoom_view_ = new ZoomView(delegate_); | 374 zoom_view_ = new ZoomView(delegate_); |
375 zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON); | 375 zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON); |
376 AddChildView(zoom_view_); | 376 AddChildView(zoom_view_); |
377 | 377 |
378 open_pdf_in_reader_view_ = new OpenPDFInReaderView(); | 378 open_pdf_in_reader_view_ = new OpenPDFInReaderView(); |
379 AddChildView(open_pdf_in_reader_view_); | 379 AddChildView(open_pdf_in_reader_view_); |
380 | 380 |
381 manage_passwords_icon_view_ = new ManagePasswordsIconView(delegate_); | 381 manage_passwords_icon_view_ = |
382 manage_passwords_icon_view_->SetState(ManagePasswordsIcon::INACTIVE_STATE); | 382 new ManagePasswordsIconView(delegate_, command_updater()); |
383 AddChildView(manage_passwords_icon_view_); | 383 AddChildView(manage_passwords_icon_view_); |
384 | 384 |
385 translate_icon_view_ = new TranslateIconView(command_updater()); | 385 translate_icon_view_ = new TranslateIconView(command_updater()); |
386 translate_icon_view_->SetVisible(false); | 386 translate_icon_view_->SetVisible(false); |
387 AddChildView(translate_icon_view_); | 387 AddChildView(translate_icon_view_); |
388 | 388 |
389 star_view_ = new StarView(command_updater()); | 389 star_view_ = new StarView(command_updater()); |
390 star_view_->SetVisible(false); | 390 star_view_->SetVisible(false); |
391 AddChildView(star_view_); | 391 AddChildView(star_view_); |
392 | 392 |
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1659 void LocationBarView::ModelChanged(const SearchModel::State& old_state, | 1659 void LocationBarView::ModelChanged(const SearchModel::State& old_state, |
1660 const SearchModel::State& new_state) { | 1660 const SearchModel::State& new_state) { |
1661 const bool visible = !GetToolbarModel()->input_in_progress() && | 1661 const bool visible = !GetToolbarModel()->input_in_progress() && |
1662 new_state.voice_search_supported; | 1662 new_state.voice_search_supported; |
1663 if (mic_search_view_->visible() != visible) { | 1663 if (mic_search_view_->visible() != visible) { |
1664 mic_search_view_->SetVisible(visible); | 1664 mic_search_view_->SetVisible(visible); |
1665 Layout(); | 1665 Layout(); |
1666 } | 1666 } |
1667 } | 1667 } |
1668 | 1668 |
OLD | NEW |