| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 } | 576 } |
| 577 | 577 |
| 578 void LocationBarViewMac::ShowURL() { | 578 void LocationBarViewMac::ShowURL() { |
| 579 omnibox_view_->ShowURL(); | 579 omnibox_view_->ShowURL(); |
| 580 } | 580 } |
| 581 | 581 |
| 582 void LocationBarViewMac::HideURL() { | 582 void LocationBarViewMac::HideURL() { |
| 583 omnibox_view_->HideURL(); | 583 omnibox_view_->HideURL(); |
| 584 } | 584 } |
| 585 | 585 |
| 586 void LocationBarViewMac::EndOriginChipAnimations() { |
| 587 NOTIMPLEMENTED(); |
| 588 } |
| 589 |
| 586 InstantController* LocationBarViewMac::GetInstant() { | 590 InstantController* LocationBarViewMac::GetInstant() { |
| 587 return browser_->instant_controller() ? | 591 return browser_->instant_controller() ? |
| 588 browser_->instant_controller()->instant() : NULL; | 592 browser_->instant_controller()->instant() : NULL; |
| 589 } | 593 } |
| 590 | 594 |
| 591 WebContents* LocationBarViewMac::GetWebContents() { | 595 WebContents* LocationBarViewMac::GetWebContents() { |
| 592 return browser_->tab_strip_model()->GetActiveWebContents(); | 596 return browser_->tab_strip_model()->GetActiveWebContents(); |
| 593 } | 597 } |
| 594 | 598 |
| 595 ToolbarModel* LocationBarViewMac::GetToolbarModel() { | 599 ToolbarModel* LocationBarViewMac::GetToolbarModel() { |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 } | 796 } |
| 793 | 797 |
| 794 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { | 798 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { |
| 795 bool is_visible = !GetToolbarModel()->input_in_progress() && | 799 bool is_visible = !GetToolbarModel()->input_in_progress() && |
| 796 browser_->search_model()->voice_search_supported(); | 800 browser_->search_model()->voice_search_supported(); |
| 797 if (mic_search_decoration_->IsVisible() == is_visible) | 801 if (mic_search_decoration_->IsVisible() == is_visible) |
| 798 return false; | 802 return false; |
| 799 mic_search_decoration_->SetVisible(is_visible); | 803 mic_search_decoration_->SetVisible(is_visible); |
| 800 return true; | 804 return true; |
| 801 } | 805 } |
| OLD | NEW |