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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #include "content/browser/user_metrics.h" | 82 #include "content/browser/user_metrics.h" |
83 #include "content/public/browser/notification_service.h" | 83 #include "content/public/browser/notification_service.h" |
84 #include "content/public/common/content_switches.h" | 84 #include "content/public/common/content_switches.h" |
85 #include "grit/chromium_strings.h" | 85 #include "grit/chromium_strings.h" |
86 #include "grit/generated_resources.h" | 86 #include "grit/generated_resources.h" |
87 #include "grit/locale_settings.h" | 87 #include "grit/locale_settings.h" |
88 #include "grit/theme_resources.h" | 88 #include "grit/theme_resources.h" |
89 #include "grit/theme_resources_standard.h" | 89 #include "grit/theme_resources_standard.h" |
90 #include "grit/ui_resources.h" | 90 #include "grit/ui_resources.h" |
91 #include "grit/webkit_resources.h" | 91 #include "grit/webkit_resources.h" |
| 92 #include "ui/base/accelerators/accelerator.h" |
92 #include "ui/base/accessibility/accessible_view_state.h" | 93 #include "ui/base/accessibility/accessible_view_state.h" |
93 #include "ui/base/hit_test.h" | 94 #include "ui/base/hit_test.h" |
94 #include "ui/base/l10n/l10n_util.h" | 95 #include "ui/base/l10n/l10n_util.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" | 102 #include "ui/views/widget/native_widget.h" |
103 #include "ui/views/widget/root_view.h" | 103 #include "ui/views/widget/root_view.h" |
104 #include "ui/views/widget/widget.h" | 104 #include "ui/views/widget/widget.h" |
105 #include "ui/views/window/dialog_delegate.h" | 105 #include "ui/views/window/dialog_delegate.h" |
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2641 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); | 2641 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); |
2642 views::BubbleDelegateView::CreateBubble(bubble); | 2642 views::BubbleDelegateView::CreateBubble(bubble); |
2643 bubble->Show(); | 2643 bubble->Show(); |
2644 } | 2644 } |
2645 | 2645 |
2646 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2646 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2647 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2647 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2648 if (button) | 2648 if (button) |
2649 button->ShowAvatarBubble(); | 2649 button->ShowAvatarBubble(); |
2650 } | 2650 } |
OLD | NEW |