Chromium Code Reviews| 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 381 generated_credit_card_view_ = new GeneratedCreditCardView(delegate_); | 381 generated_credit_card_view_ = new GeneratedCreditCardView(delegate_); |
| 382 AddChildView(generated_credit_card_view_); | 382 AddChildView(generated_credit_card_view_); |
| 383 | 383 |
| 384 zoom_view_ = new ZoomView(delegate_); | 384 zoom_view_ = new ZoomView(delegate_); |
| 385 zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON); | 385 zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON); |
| 386 AddChildView(zoom_view_); | 386 AddChildView(zoom_view_); |
| 387 | 387 |
| 388 open_pdf_in_reader_view_ = new OpenPDFInReaderView(); | 388 open_pdf_in_reader_view_ = new OpenPDFInReaderView(); |
| 389 AddChildView(open_pdf_in_reader_view_); | 389 AddChildView(open_pdf_in_reader_view_); |
| 390 | 390 |
| 391 manage_passwords_icon_view_ = new ManagePasswordsIconView(delegate_); | 391 manage_passwords_icon_view_ = |
| 392 new ManagePasswordsIconView(delegate_, command_updater()); | |
| 392 manage_passwords_icon_view_->SetState(ManagePasswordsIcon::INACTIVE_STATE); | 393 manage_passwords_icon_view_->SetState(ManagePasswordsIcon::INACTIVE_STATE); |
|
Peter Kasting
2014/04/25 22:12:02
Nit: This line doesn't seem necessary
Mike West
2014/04/28 10:52:56
Done.
| |
| 393 AddChildView(manage_passwords_icon_view_); | 394 AddChildView(manage_passwords_icon_view_); |
| 394 | 395 |
| 395 translate_icon_view_ = new TranslateIconView(command_updater()); | 396 translate_icon_view_ = new TranslateIconView(command_updater()); |
| 396 translate_icon_view_->SetVisible(false); | 397 translate_icon_view_->SetVisible(false); |
| 397 AddChildView(translate_icon_view_); | 398 AddChildView(translate_icon_view_); |
| 398 | 399 |
| 399 star_view_ = new StarView(command_updater()); | 400 star_view_ = new StarView(command_updater()); |
| 400 star_view_->SetVisible(false); | 401 star_view_->SetVisible(false); |
| 401 AddChildView(star_view_); | 402 AddChildView(star_view_); |
| 402 | 403 |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1694 void LocationBarView::ModelChanged(const SearchModel::State& old_state, | 1695 void LocationBarView::ModelChanged(const SearchModel::State& old_state, |
| 1695 const SearchModel::State& new_state) { | 1696 const SearchModel::State& new_state) { |
| 1696 const bool visible = !GetToolbarModel()->input_in_progress() && | 1697 const bool visible = !GetToolbarModel()->input_in_progress() && |
| 1697 new_state.voice_search_supported; | 1698 new_state.voice_search_supported; |
| 1698 if (mic_search_view_->visible() != visible) { | 1699 if (mic_search_view_->visible() != visible) { |
| 1699 mic_search_view_->SetVisible(visible); | 1700 mic_search_view_->SetVisible(visible); |
| 1700 Layout(); | 1701 Layout(); |
| 1701 } | 1702 } |
| 1702 } | 1703 } |
| 1703 | 1704 |
| OLD | NEW |