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 19 matching lines...) Expand all Loading... |
30 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
31 #include "chrome/browser/profiles/profiles_state.h" | 31 #include "chrome/browser/profiles/profiles_state.h" |
32 #include "chrome/browser/search/search.h" | 32 #include "chrome/browser/search/search.h" |
33 #include "chrome/browser/sessions/tab_restore_service.h" | 33 #include "chrome/browser/sessions/tab_restore_service.h" |
34 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 34 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
35 #include "chrome/browser/signin/signin_header_helper.h" | 35 #include "chrome/browser/signin/signin_header_helper.h" |
36 #include "chrome/browser/speech/tts_controller.h" | 36 #include "chrome/browser/speech/tts_controller.h" |
37 #include "chrome/browser/themes/theme_properties.h" | 37 #include "chrome/browser/themes/theme_properties.h" |
38 #include "chrome/browser/themes/theme_service_factory.h" | 38 #include "chrome/browser/themes/theme_service_factory.h" |
39 #include "chrome/browser/translate/chrome_translate_client.h" | 39 #include "chrome/browser/translate/chrome_translate_client.h" |
40 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | |
41 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" | |
42 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 40 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
43 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" | 41 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" |
44 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" | 42 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" |
45 #include "chrome/browser/ui/browser.h" | 43 #include "chrome/browser/ui/browser.h" |
46 #include "chrome/browser/ui/browser_command_controller.h" | 44 #include "chrome/browser/ui/browser_command_controller.h" |
47 #include "chrome/browser/ui/browser_commands.h" | 45 #include "chrome/browser/ui/browser_commands.h" |
48 #include "chrome/browser/ui/browser_dialogs.h" | 46 #include "chrome/browser/ui/browser_dialogs.h" |
49 #include "chrome/browser/ui/browser_finder.h" | 47 #include "chrome/browser/ui/browser_finder.h" |
50 #include "chrome/browser/ui/browser_list.h" | 48 #include "chrome/browser/ui/browser_list.h" |
51 #include "chrome/browser/ui/browser_window_state.h" | 49 #include "chrome/browser/ui/browser_window_state.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" | 91 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" |
94 #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
" |
95 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" | 93 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
96 #include "chrome/browser/ui/window_sizer/window_sizer.h" | 94 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
97 #include "chrome/common/chrome_switches.h" | 95 #include "chrome/common/chrome_switches.h" |
98 #include "chrome/common/pref_names.h" | 96 #include "chrome/common/pref_names.h" |
99 #include "chrome/common/url_constants.h" | 97 #include "chrome/common/url_constants.h" |
100 #include "chrome/grit/chromium_strings.h" | 98 #include "chrome/grit/chromium_strings.h" |
101 #include "chrome/grit/generated_resources.h" | 99 #include "chrome/grit/generated_resources.h" |
102 #include "chrome/grit/locale_settings.h" | 100 #include "chrome/grit/locale_settings.h" |
| 101 #include "components/app_modal_dialogs/app_modal_dialog.h" |
| 102 #include "components/app_modal_dialogs/app_modal_dialog_queue.h" |
103 #include "components/signin/core/common/profile_management_switches.h" | 103 #include "components/signin/core/common/profile_management_switches.h" |
104 #include "components/translate/core/browser/language_state.h" | 104 #include "components/translate/core/browser/language_state.h" |
105 #include "content/app/resources/grit/content_resources.h" | 105 #include "content/app/resources/grit/content_resources.h" |
106 #include "content/public/browser/download_manager.h" | 106 #include "content/public/browser/download_manager.h" |
107 #include "content/public/browser/native_web_keyboard_event.h" | 107 #include "content/public/browser/native_web_keyboard_event.h" |
108 #include "content/public/browser/notification_service.h" | 108 #include "content/public/browser/notification_service.h" |
109 #include "content/public/browser/render_frame_host.h" | 109 #include "content/public/browser/render_frame_host.h" |
110 #include "content/public/browser/render_view_host.h" | 110 #include "content/public/browser/render_view_host.h" |
111 #include "content/public/browser/user_metrics.h" | 111 #include "content/public/browser/user_metrics.h" |
112 #include "content/public/browser/web_contents.h" | 112 #include "content/public/browser/web_contents.h" |
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2521 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2521 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2522 gfx::Point icon_bottom( | 2522 gfx::Point icon_bottom( |
2523 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2523 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2524 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2524 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2525 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2525 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2526 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2526 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2527 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2527 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2528 } | 2528 } |
2529 return top_arrow_height; | 2529 return top_arrow_height; |
2530 } | 2530 } |
OLD | NEW |