| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| index eda3e577d76b224b4d1e2206011e1321879afb14..51cd76b21ea029194d92021ca983ca0c596b240c 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| @@ -40,7 +40,6 @@
|
| #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
|
| -#import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
|
| @@ -102,7 +101,6 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
|
| translate_decoration_(new TranslateDecoration(command_updater)),
|
| zoom_decoration_(new ZoomDecoration(this)),
|
| keyword_hint_decoration_(new KeywordHintDecoration()),
|
| - mic_search_decoration_(new MicSearchDecoration(command_updater)),
|
| manage_passwords_decoration_(
|
| new ManagePasswordsDecoration(command_updater, this)),
|
| browser_(browser),
|
| @@ -119,8 +117,6 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
|
| base::Bind(&LocationBarViewMac::OnEditBookmarksEnabledChanged,
|
| base::Unretained(this)));
|
|
|
| - browser_->search_model()->AddObserver(this);
|
| -
|
| ui_zoom::ZoomEventManager::GetForBrowserContext(profile)
|
| ->AddZoomEventManagerObserver(this);
|
|
|
| @@ -136,7 +132,6 @@ LocationBarViewMac::~LocationBarViewMac() {
|
| // Disconnect from cell in case it outlives us.
|
| [[field_ cell] clearDecorations];
|
|
|
| - browser_->search_model()->RemoveObserver(this);
|
| ui_zoom::ZoomEventManager::GetForBrowserContext(profile())
|
| ->RemoveZoomEventManagerObserver(this);
|
| }
|
| @@ -410,7 +405,6 @@ void LocationBarViewMac::Layout() {
|
| }
|
|
|
| [cell addRightDecoration:keyword_hint_decoration_.get()];
|
| - [cell addRightDecoration:mic_search_decoration_.get()];
|
|
|
| // By default only the location icon is visible.
|
| location_icon_decoration_->SetVisible(true);
|
| @@ -523,7 +517,6 @@ void LocationBarViewMac::Update(const WebContents* contents) {
|
| UpdateZoomDecoration(/*default_zoom_changed=*/false);
|
| RefreshPageActionDecorations();
|
| RefreshContentSettingsDecorations();
|
| - UpdateMicSearchDecorationVisibility();
|
| if (contents)
|
| omnibox_view_->OnTabChanged(contents);
|
| else
|
| @@ -584,12 +577,6 @@ NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
|
| return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
|
| }
|
|
|
| -void LocationBarViewMac::ModelChanged(const SearchModel::State& old_state,
|
| - const SearchModel::State& new_state) {
|
| - if (UpdateMicSearchDecorationVisibility())
|
| - Layout();
|
| -}
|
| -
|
| void LocationBarViewMac::PostNotification(NSString* notification) {
|
| [[NSNotificationCenter defaultCenter] postNotificationName:notification
|
| object:[NSValue valueWithPointer:this]];
|
| @@ -727,12 +714,3 @@ void LocationBarViewMac::OnDefaultZoomLevelChanged() {
|
| if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
|
| OnDecorationsChanged();
|
| }
|
| -
|
| -bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
|
| - bool is_visible = !GetToolbarModel()->input_in_progress() &&
|
| - browser_->search_model()->voice_search_supported();
|
| - if (mic_search_decoration_->IsVisible() == is_visible)
|
| - return false;
|
| - mic_search_decoration_->SetVisible(is_visible);
|
| - return true;
|
| -}
|
|
|