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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 55 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
56 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 56 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
57 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 57 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
58 #include "chrome/browser/ui/omnibox/location_bar_util.h" | 58 #include "chrome/browser/ui/omnibox/location_bar_util.h" |
59 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 59 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
60 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 60 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
61 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 61 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
62 #include "chrome/browser/ui/zoom/zoom_controller.h" | 62 #include "chrome/browser/ui/zoom/zoom_controller.h" |
63 #include "chrome/common/chrome_switches.h" | 63 #include "chrome/common/chrome_switches.h" |
64 #include "chrome/common/pref_names.h" | 64 #include "chrome/common/pref_names.h" |
| 65 #include "components/bookmarks/bookmark_pref_names.h" |
65 #include "components/translate/core/browser/language_state.h" | 66 #include "components/translate/core/browser/language_state.h" |
66 #include "content/public/browser/notification_service.h" | 67 #include "content/public/browser/notification_service.h" |
67 #include "content/public/browser/web_contents.h" | 68 #include "content/public/browser/web_contents.h" |
68 #include "extensions/browser/extension_system.h" | 69 #include "extensions/browser/extension_system.h" |
69 #include "extensions/common/extension.h" | 70 #include "extensions/common/extension.h" |
70 #include "extensions/common/permissions/permissions_data.h" | 71 #include "extensions/common/permissions/permissions_data.h" |
71 #include "grit/generated_resources.h" | 72 #include "grit/generated_resources.h" |
72 #include "grit/theme_resources.h" | 73 #include "grit/theme_resources.h" |
73 #include "net/base/net_util.h" | 74 #include "net/base/net_util.h" |
74 #include "skia/ext/skia_utils_mac.h" | 75 #include "skia/ext/skia_utils_mac.h" |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
788 } | 789 } |
789 | 790 |
790 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { | 791 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { |
791 bool is_visible = !GetToolbarModel()->input_in_progress() && | 792 bool is_visible = !GetToolbarModel()->input_in_progress() && |
792 browser_->search_model()->voice_search_supported(); | 793 browser_->search_model()->voice_search_supported(); |
793 if (mic_search_decoration_->IsVisible() == is_visible) | 794 if (mic_search_decoration_->IsVisible() == is_visible) |
794 return false; | 795 return false; |
795 mic_search_decoration_->SetVisible(is_visible); | 796 mic_search_decoration_->SetVisible(is_visible); |
796 return true; | 797 return true; |
797 } | 798 } |
OLD | NEW |