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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 #include "content/public/browser/notification_service.h" | 107 #include "content/public/browser/notification_service.h" |
108 #include "content/public/browser/render_frame_host.h" | 108 #include "content/public/browser/render_frame_host.h" |
109 #include "content/public/browser/render_view_host.h" | 109 #include "content/public/browser/render_view_host.h" |
110 #include "content/public/browser/user_metrics.h" | 110 #include "content/public/browser/user_metrics.h" |
111 #include "content/public/browser/web_contents.h" | 111 #include "content/public/browser/web_contents.h" |
112 #include "content/public/common/content_switches.h" | 112 #include "content/public/common/content_switches.h" |
113 #include "grit/chromium_strings.h" | 113 #include "grit/chromium_strings.h" |
114 #include "grit/generated_resources.h" | 114 #include "grit/generated_resources.h" |
115 #include "grit/locale_settings.h" | 115 #include "grit/locale_settings.h" |
116 #include "grit/theme_resources.h" | 116 #include "grit/theme_resources.h" |
117 #include "grit/ui_strings.h" | |
118 #include "ui/accessibility/ax_view_state.h" | 117 #include "ui/accessibility/ax_view_state.h" |
119 #include "ui/aura/client/window_tree_client.h" | 118 #include "ui/aura/client/window_tree_client.h" |
120 #include "ui/aura/window.h" | 119 #include "ui/aura/window.h" |
121 #include "ui/aura/window_tree_host.h" | 120 #include "ui/aura/window_tree_host.h" |
122 #include "ui/base/accelerators/accelerator.h" | 121 #include "ui/base/accelerators/accelerator.h" |
123 #include "ui/base/hit_test.h" | 122 #include "ui/base/hit_test.h" |
124 #include "ui/base/l10n/l10n_util.h" | 123 #include "ui/base/l10n/l10n_util.h" |
125 #include "ui/base/resource/resource_bundle.h" | 124 #include "ui/base/resource/resource_bundle.h" |
126 #include "ui/base/theme_provider.h" | 125 #include "ui/base/theme_provider.h" |
127 #include "ui/events/event_utils.h" | 126 #include "ui/events/event_utils.h" |
128 #include "ui/gfx/canvas.h" | 127 #include "ui/gfx/canvas.h" |
129 #include "ui/gfx/color_utils.h" | 128 #include "ui/gfx/color_utils.h" |
130 #include "ui/gfx/rect_conversions.h" | 129 #include "ui/gfx/rect_conversions.h" |
131 #include "ui/gfx/screen.h" | 130 #include "ui/gfx/screen.h" |
132 #include "ui/resources/grit/ui_resources.h" | 131 #include "ui/resources/grit/ui_resources.h" |
| 132 #include "ui/strings/grit/ui_strings.h" |
133 #include "ui/views/controls/button/menu_button.h" | 133 #include "ui/views/controls/button/menu_button.h" |
134 #include "ui/views/controls/textfield/textfield.h" | 134 #include "ui/views/controls/textfield/textfield.h" |
135 #include "ui/views/controls/webview/webview.h" | 135 #include "ui/views/controls/webview/webview.h" |
136 #include "ui/views/focus/external_focus_tracker.h" | 136 #include "ui/views/focus/external_focus_tracker.h" |
137 #include "ui/views/focus/view_storage.h" | 137 #include "ui/views/focus/view_storage.h" |
138 #include "ui/views/layout/grid_layout.h" | 138 #include "ui/views/layout/grid_layout.h" |
139 #include "ui/views/widget/native_widget.h" | 139 #include "ui/views/widget/native_widget.h" |
140 #include "ui/views/widget/root_view.h" | 140 #include "ui/views/widget/root_view.h" |
141 #include "ui/views/widget/widget.h" | 141 #include "ui/views/widget/widget.h" |
142 #include "ui/views/window/dialog_delegate.h" | 142 #include "ui/views/window/dialog_delegate.h" |
(...skipping 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2557 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2557 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2558 gfx::Point icon_bottom( | 2558 gfx::Point icon_bottom( |
2559 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2559 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2560 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2560 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2561 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2561 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2562 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2562 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2563 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2563 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2564 } | 2564 } |
2565 return top_arrow_height; | 2565 return top_arrow_height; |
2566 } | 2566 } |
OLD | NEW |