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 #include "chrome/browser/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 52 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
53 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 53 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
54 #include "chrome/browser/ui/search/search_delegate.h" | 54 #include "chrome/browser/ui/search/search_delegate.h" |
55 #include "chrome/browser/ui/search/search_model.h" | 55 #include "chrome/browser/ui/search/search_model.h" |
56 #include "chrome/browser/ui/search/search_ui.h" | 56 #include "chrome/browser/ui/search/search_ui.h" |
57 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 57 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
58 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 58 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
59 #include "chrome/browser/ui/view_ids.h" | 59 #include "chrome/browser/ui/view_ids.h" |
60 #include "chrome/browser/ui/views/accelerator_table.h" | 60 #include "chrome/browser/ui/views/accelerator_table.h" |
61 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" | 61 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" |
62 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" | |
63 #include "chrome/browser/ui/views/avatar_menu_button.h" | |
64 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 62 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
65 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 63 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
66 #include "chrome/browser/ui/views/browser_dialogs.h" | 64 #include "chrome/browser/ui/views/browser_dialogs.h" |
67 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 65 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
68 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 66 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
69 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" | 67 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" |
70 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 68 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
71 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 69 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
72 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 70 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
73 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 71 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
74 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" | 72 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" |
75 #include "chrome/browser/ui/views/frame/top_container_view.h" | 73 #include "chrome/browser/ui/views/frame/top_container_view.h" |
76 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" | 74 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" |
77 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 75 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
78 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 76 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
79 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 77 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
80 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 78 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
81 #include "chrome/browser/ui/views/password_generation_bubble_view.h" | 79 #include "chrome/browser/ui/views/password_generation_bubble_view.h" |
82 #include "chrome/browser/ui/views/profile_chooser_view.h" | 80 #include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h" |
| 81 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
| 82 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
83 #include "chrome/browser/ui/views/status_bubble_views.h" | 83 #include "chrome/browser/ui/views/status_bubble_views.h" |
84 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" | 84 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
85 #include "chrome/browser/ui/views/tabs/tab.h" | 85 #include "chrome/browser/ui/views/tabs/tab.h" |
86 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 86 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
87 #include "chrome/browser/ui/views/toolbar/reload_button.h" | 87 #include "chrome/browser/ui/views/toolbar/reload_button.h" |
88 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 88 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
89 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" | 89 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
90 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 90 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
91 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" | 91 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" |
92 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 92 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2585 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2585 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2586 gfx::Point icon_bottom( | 2586 gfx::Point icon_bottom( |
2587 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2587 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2588 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2588 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2589 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2589 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2590 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2590 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2591 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2591 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2592 } | 2592 } |
2593 return top_arrow_height; | 2593 return top_arrow_height; |
2594 } | 2594 } |
OLD | NEW |