| 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" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 13 #include "base/strings/sys_string_conversions.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #import "chrome/browser/app_controller_mac.h" | 16 #import "chrome/browser/app_controller_mac.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/command_updater.h" | 18 #include "chrome/browser/command_updater.h" |
| 19 #include "chrome/browser/defaults.h" | 19 #include "chrome/browser/defaults.h" |
| 20 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 20 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
| 21 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 21 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 22 #include "chrome/browser/extensions/extension_action.h" | 22 #include "chrome/browser/extensions/extension_action.h" |
| 23 #include "chrome/browser/extensions/extension_service.h" | 23 #include "chrome/browser/extensions/extension_service.h" |
| 24 #include "chrome/browser/extensions/location_bar_controller.h" | 24 #include "chrome/browser/extensions/location_bar_controller.h" |
| 25 #include "chrome/browser/extensions/tab_helper.h" | 25 #include "chrome/browser/extensions/tab_helper.h" |
| 26 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
| 27 #include "chrome/browser/search/instant_service.h" | 27 #include "chrome/browser/search/instant_service.h" |
| 28 #include "chrome/browser/search/instant_service_factory.h" | 28 #include "chrome/browser/search/instant_service_factory.h" |
| 29 #include "chrome/browser/search/search.h" | 29 #include "chrome/browser/search/search.h" |
| 30 #include "chrome/browser/search_engines/template_url_service.h" | |
| 31 #include "chrome/browser/search_engines/template_url_service_factory.h" | 30 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 32 #include "chrome/browser/translate/chrome_translate_client.h" | 31 #include "chrome/browser/translate/chrome_translate_client.h" |
| 33 #include "chrome/browser/translate/translate_service.h" | 32 #include "chrome/browser/translate/translate_service.h" |
| 34 #include "chrome/browser/ui/browser_instant_controller.h" | 33 #include "chrome/browser/ui/browser_instant_controller.h" |
| 35 #include "chrome/browser/ui/browser_list.h" | 34 #include "chrome/browser/ui/browser_list.h" |
| 36 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
" | 35 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
" |
| 37 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 36 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| 38 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" | 37 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" |
| 39 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" | 38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" |
| 40 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" | 39 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 54 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 53 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
| 55 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 54 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
| 56 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 55 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
| 57 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 56 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
| 58 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 57 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 59 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 58 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 60 #include "chrome/browser/ui/zoom/zoom_controller.h" | 59 #include "chrome/browser/ui/zoom/zoom_controller.h" |
| 61 #include "chrome/common/chrome_switches.h" | 60 #include "chrome/common/chrome_switches.h" |
| 62 #include "chrome/common/pref_names.h" | 61 #include "chrome/common/pref_names.h" |
| 63 #include "components/search_engines/template_url.h" | 62 #include "components/search_engines/template_url.h" |
| 63 #include "components/search_engines/template_url_service.h" |
| 64 #include "components/translate/core/browser/language_state.h" | 64 #include "components/translate/core/browser/language_state.h" |
| 65 #include "content/public/browser/notification_service.h" | 65 #include "content/public/browser/notification_service.h" |
| 66 #include "content/public/browser/web_contents.h" | 66 #include "content/public/browser/web_contents.h" |
| 67 #include "extensions/browser/extension_system.h" | 67 #include "extensions/browser/extension_system.h" |
| 68 #include "extensions/common/extension.h" | 68 #include "extensions/common/extension.h" |
| 69 #include "extensions/common/permissions/permissions_data.h" | 69 #include "extensions/common/permissions/permissions_data.h" |
| 70 #include "grit/generated_resources.h" | 70 #include "grit/generated_resources.h" |
| 71 #include "grit/theme_resources.h" | 71 #include "grit/theme_resources.h" |
| 72 #include "net/base/net_util.h" | 72 #include "net/base/net_util.h" |
| 73 #include "skia/ext/skia_utils_mac.h" | 73 #include "skia/ext/skia_utils_mac.h" |
| (...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 } | 785 } |
| 786 | 786 |
| 787 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { | 787 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { |
| 788 bool is_visible = !GetToolbarModel()->input_in_progress() && | 788 bool is_visible = !GetToolbarModel()->input_in_progress() && |
| 789 browser_->search_model()->voice_search_supported(); | 789 browser_->search_model()->voice_search_supported(); |
| 790 if (mic_search_decoration_->IsVisible() == is_visible) | 790 if (mic_search_decoration_->IsVisible() == is_visible) |
| 791 return false; | 791 return false; |
| 792 mic_search_decoration_->SetVisible(is_visible); | 792 mic_search_decoration_->SetVisible(is_visible); |
| 793 return true; | 793 return true; |
| 794 } | 794 } |
| OLD | NEW |