OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 #include "ui/base/accessibility/accessible_view_state.h" | 92 #include "ui/base/accessibility/accessible_view_state.h" |
93 #include "ui/base/hit_test.h" | 93 #include "ui/base/hit_test.h" |
94 #include "ui/base/l10n/l10n_util.h" | 94 #include "ui/base/l10n/l10n_util.h" |
95 #include "ui/base/models/accelerator.h" | 95 #include "ui/base/models/accelerator.h" |
96 #include "ui/base/resource/resource_bundle.h" | 96 #include "ui/base/resource/resource_bundle.h" |
97 #include "ui/gfx/canvas_skia.h" | 97 #include "ui/gfx/canvas_skia.h" |
98 #include "ui/views/events/event.h" | 98 #include "ui/views/events/event.h" |
99 #include "ui/views/focus/external_focus_tracker.h" | 99 #include "ui/views/focus/external_focus_tracker.h" |
100 #include "ui/views/focus/view_storage.h" | 100 #include "ui/views/focus/view_storage.h" |
101 #include "ui/views/layout/grid_layout.h" | 101 #include "ui/views/layout/grid_layout.h" |
| 102 #include "ui/views/widget/native_widget.h" |
| 103 #include "ui/views/widget/root_view.h" |
| 104 #include "ui/views/widget/widget.h" |
102 #include "ui/views/window/dialog_delegate.h" | 105 #include "ui/views/window/dialog_delegate.h" |
103 #include "views/controls/single_split_view.h" | 106 #include "views/controls/single_split_view.h" |
104 #include "views/widget/native_widget.h" | |
105 #include "views/widget/root_view.h" | |
106 #include "views/widget/widget.h" | |
107 | 107 |
108 #if defined(USE_AURA) | 108 #if defined(USE_AURA) |
109 #include "chrome/browser/ui/views/accelerator_table.h" | 109 #include "chrome/browser/ui/views/accelerator_table.h" |
110 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 110 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
111 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h" | 111 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h" |
112 #include "ui/aura_shell/launcher/launcher.h" | 112 #include "ui/aura_shell/launcher/launcher.h" |
113 #include "ui/aura_shell/launcher/launcher_model.h" | 113 #include "ui/aura_shell/launcher/launcher_model.h" |
114 #include "ui/aura_shell/shell.h" | 114 #include "ui/aura_shell/shell.h" |
115 #include "ui/gfx/screen.h" | 115 #include "ui/gfx/screen.h" |
116 #elif defined(OS_WIN) | 116 #elif defined(OS_WIN) |
117 #include "chrome/browser/aeropeek_manager.h" | 117 #include "chrome/browser/aeropeek_manager.h" |
118 #include "chrome/browser/jumplist_win.h" | 118 #include "chrome/browser/jumplist_win.h" |
119 #include "ui/base/message_box_win.h" | 119 #include "ui/base/message_box_win.h" |
120 #include "views/widget/native_widget_win.h" | 120 #include "ui/views/widget/native_widget_win.h" |
121 #elif defined(TOOLKIT_USES_GTK) | 121 #elif defined(TOOLKIT_USES_GTK) |
122 #include "chrome/browser/ui/views/accelerator_table.h" | 122 #include "chrome/browser/ui/views/accelerator_table.h" |
123 #if !defined(TOUCH_UI) | 123 #if !defined(TOUCH_UI) |
124 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" | 124 #include "chrome/browser/ui/views/handle_web_keyboard_event.h" |
125 #endif | 125 #endif |
126 #endif | 126 #endif |
127 | 127 |
128 #if defined(OS_CHROMEOS) | 128 #if defined(OS_CHROMEOS) |
129 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 129 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
130 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 130 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
(...skipping 2489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2620 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, | 2620 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, |
2621 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, | 2621 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, |
2622 bubble_view, bubble_view); | 2622 bubble_view, bubble_view); |
2623 } | 2623 } |
2624 | 2624 |
2625 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2625 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2626 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2626 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2627 if (button) | 2627 if (button) |
2628 button->ShowAvatarBubble(); | 2628 button->ShowAvatarBubble(); |
2629 } | 2629 } |
OLD | NEW |