| 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 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 | 592 |
| 593 void LocationBarViewMac::ShowURL() { | 593 void LocationBarViewMac::ShowURL() { |
| 594 omnibox_view_->ShowURL(); | 594 omnibox_view_->ShowURL(); |
| 595 } | 595 } |
| 596 | 596 |
| 597 void LocationBarViewMac::HideURL() { | 597 void LocationBarViewMac::HideURL() { |
| 598 omnibox_view_->HideURL(); | 598 omnibox_view_->HideURL(); |
| 599 } | 599 } |
| 600 | 600 |
| 601 void LocationBarViewMac::EndOriginChipAnimations(bool cancel_fade) { | 601 void LocationBarViewMac::EndOriginChipAnimations(bool cancel_fade) { |
| 602 NOTIMPLEMENTED(); | |
| 603 } | 602 } |
| 604 | 603 |
| 605 InstantController* LocationBarViewMac::GetInstant() { | 604 InstantController* LocationBarViewMac::GetInstant() { |
| 606 return browser_->instant_controller() ? | 605 return browser_->instant_controller() ? |
| 607 browser_->instant_controller()->instant() : NULL; | 606 browser_->instant_controller()->instant() : NULL; |
| 608 } | 607 } |
| 609 | 608 |
| 610 WebContents* LocationBarViewMac::GetWebContents() { | 609 WebContents* LocationBarViewMac::GetWebContents() { |
| 611 return browser_->tab_strip_model()->GetActiveWebContents(); | 610 return browser_->tab_strip_model()->GetActiveWebContents(); |
| 612 } | 611 } |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 } | 764 } |
| 766 | 765 |
| 767 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { | 766 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { |
| 768 bool is_visible = !GetToolbarModel()->input_in_progress() && | 767 bool is_visible = !GetToolbarModel()->input_in_progress() && |
| 769 browser_->search_model()->voice_search_supported(); | 768 browser_->search_model()->voice_search_supported(); |
| 770 if (mic_search_decoration_->IsVisible() == is_visible) | 769 if (mic_search_decoration_->IsVisible() == is_visible) |
| 771 return false; | 770 return false; |
| 772 mic_search_decoration_->SetVisible(is_visible); | 771 mic_search_decoration_->SetVisible(is_visible); |
| 773 return true; | 772 return true; |
| 774 } | 773 } |
| OLD | NEW |