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" |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
13 #include "base/stl_util.h" | 13 #include "base/stl_util.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 #include "chrome/browser/chrome_notification_types.h" |
16 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
17 #include "chrome/browser/defaults.h" | 18 #include "chrome/browser/defaults.h" |
18 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 19 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
19 #include "chrome/browser/extensions/location_bar_controller.h" | 20 #include "chrome/browser/extensions/location_bar_controller.h" |
20 #include "chrome/browser/extensions/script_bubble_controller.h" | 21 #include "chrome/browser/extensions/script_bubble_controller.h" |
21 #include "chrome/browser/extensions/tab_helper.h" | 22 #include "chrome/browser/extensions/tab_helper.h" |
22 #include "chrome/browser/favicon/favicon_tab_helper.h" | 23 #include "chrome/browser/favicon/favicon_tab_helper.h" |
23 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/search_engines/template_url.h" | 25 #include "chrome/browser/search_engines/template_url.h" |
25 #include "chrome/browser/search_engines/template_url_service.h" | 26 #include "chrome/browser/search_engines/template_url_service.h" |
(...skipping 21 matching lines...) Expand all Loading... |
47 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" | 48 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" |
48 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" | 49 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" |
49 #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h" | 50 #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h" |
50 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" | 51 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" |
51 #include "chrome/browser/ui/views/location_bar/star_view.h" | 52 #include "chrome/browser/ui/views/location_bar/star_view.h" |
52 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 53 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
53 #include "chrome/browser/ui/views/location_bar/zoom_view.h" | 54 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
54 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 55 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
55 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" | 56 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" |
56 #include "chrome/browser/ui/zoom/zoom_controller.h" | 57 #include "chrome/browser/ui/zoom/zoom_controller.h" |
57 #include "chrome/common/chrome_notification_types.h" | |
58 #include "chrome/common/extensions/feature_switch.h" | 58 #include "chrome/common/extensions/feature_switch.h" |
59 #include "chrome/common/pref_names.h" | 59 #include "chrome/common/pref_names.h" |
60 #include "content/public/browser/notification_service.h" | 60 #include "content/public/browser/notification_service.h" |
61 #include "content/public/browser/render_widget_host_view.h" | 61 #include "content/public/browser/render_widget_host_view.h" |
62 #include "content/public/browser/web_contents.h" | 62 #include "content/public/browser/web_contents.h" |
63 #include "grit/generated_resources.h" | 63 #include "grit/generated_resources.h" |
64 #include "grit/theme_resources.h" | 64 #include "grit/theme_resources.h" |
65 #include "ui/base/accessibility/accessible_view_state.h" | 65 #include "ui/base/accessibility/accessible_view_state.h" |
66 #include "ui/base/dragdrop/drag_drop_types.h" | 66 #include "ui/base/dragdrop/drag_drop_types.h" |
67 #include "ui/base/events/event.h" | 67 #include "ui/base/events/event.h" |
(...skipping 1426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1494 int LocationBarView::GetInternalHeight(bool use_preferred_size) { | 1494 int LocationBarView::GetInternalHeight(bool use_preferred_size) { |
1495 int total_height = | 1495 int total_height = |
1496 use_preferred_size ? GetPreferredSize().height() : height(); | 1496 use_preferred_size ? GetPreferredSize().height() : height(); |
1497 return std::max(total_height - (vertical_edge_thickness() * 2), 0); | 1497 return std::max(total_height - (vertical_edge_thickness() * 2), 0); |
1498 } | 1498 } |
1499 | 1499 |
1500 bool LocationBarView::HasValidSuggestText() const { | 1500 bool LocationBarView::HasValidSuggestText() const { |
1501 return suggested_text_view_->visible() && | 1501 return suggested_text_view_->visible() && |
1502 !suggested_text_view_->size().IsEmpty(); | 1502 !suggested_text_view_->size().IsEmpty(); |
1503 } | 1503 } |
OLD | NEW |