OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/ui/views/location_bar/star_view.h" | 54 #include "chrome/browser/ui/views/location_bar/star_view.h" |
55 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" | 55 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" |
56 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 56 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
57 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 57 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
58 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" | 58 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" |
59 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h" | 59 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h" |
60 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" | 60 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
61 #include "chrome/browser/ui/zoom/zoom_controller.h" | 61 #include "chrome/browser/ui/zoom/zoom_controller.h" |
62 #include "chrome/common/chrome_switches.h" | 62 #include "chrome/common/chrome_switches.h" |
63 #include "chrome/common/pref_names.h" | 63 #include "chrome/common/pref_names.h" |
| 64 #include "chrome/grit/generated_resources.h" |
64 #include "components/search_engines/template_url.h" | 65 #include "components/search_engines/template_url.h" |
65 #include "components/search_engines/template_url_service.h" | 66 #include "components/search_engines/template_url_service.h" |
66 #include "components/translate/core/browser/language_state.h" | 67 #include "components/translate/core/browser/language_state.h" |
67 #include "content/public/browser/notification_service.h" | 68 #include "content/public/browser/notification_service.h" |
68 #include "content/public/browser/render_widget_host_view.h" | 69 #include "content/public/browser/render_widget_host_view.h" |
69 #include "content/public/browser/web_contents.h" | 70 #include "content/public/browser/web_contents.h" |
70 #include "extensions/browser/extension_registry.h" | 71 #include "extensions/browser/extension_registry.h" |
71 #include "extensions/common/feature_switch.h" | 72 #include "extensions/common/feature_switch.h" |
72 #include "extensions/common/permissions/permissions_data.h" | 73 #include "extensions/common/permissions/permissions_data.h" |
73 #include "grit/component_scaled_resources.h" | 74 #include "grit/component_scaled_resources.h" |
74 #include "grit/generated_resources.h" | |
75 #include "grit/theme_resources.h" | 75 #include "grit/theme_resources.h" |
76 #include "ui/accessibility/ax_view_state.h" | 76 #include "ui/accessibility/ax_view_state.h" |
77 #include "ui/base/dragdrop/drag_drop_types.h" | 77 #include "ui/base/dragdrop/drag_drop_types.h" |
78 #include "ui/base/l10n/l10n_util.h" | 78 #include "ui/base/l10n/l10n_util.h" |
79 #include "ui/base/resource/resource_bundle.h" | 79 #include "ui/base/resource/resource_bundle.h" |
80 #include "ui/base/theme_provider.h" | 80 #include "ui/base/theme_provider.h" |
81 #include "ui/events/event.h" | 81 #include "ui/events/event.h" |
82 #include "ui/gfx/animation/slide_animation.h" | 82 #include "ui/gfx/animation/slide_animation.h" |
83 #include "ui/gfx/canvas.h" | 83 #include "ui/gfx/canvas.h" |
84 #include "ui/gfx/color_utils.h" | 84 #include "ui/gfx/color_utils.h" |
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1715 | 1715 |
1716 void LocationBarView::ModelChanged(const SearchModel::State& old_state, | 1716 void LocationBarView::ModelChanged(const SearchModel::State& old_state, |
1717 const SearchModel::State& new_state) { | 1717 const SearchModel::State& new_state) { |
1718 const bool visible = !GetToolbarModel()->input_in_progress() && | 1718 const bool visible = !GetToolbarModel()->input_in_progress() && |
1719 new_state.voice_search_supported; | 1719 new_state.voice_search_supported; |
1720 if (mic_search_view_->visible() != visible) { | 1720 if (mic_search_view_->visible() != visible) { |
1721 mic_search_view_->SetVisible(visible); | 1721 mic_search_view_->SetVisible(visible); |
1722 Layout(); | 1722 Layout(); |
1723 } | 1723 } |
1724 } | 1724 } |
OLD | NEW |