OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 #include "ui/views/widget/native_widget.h" | 101 #include "ui/views/widget/native_widget.h" |
102 #include "ui/views/widget/root_view.h" | 102 #include "ui/views/widget/root_view.h" |
103 #include "ui/views/widget/widget.h" | 103 #include "ui/views/widget/widget.h" |
104 #include "ui/views/window/dialog_delegate.h" | 104 #include "ui/views/window/dialog_delegate.h" |
105 | 105 |
106 #if defined(USE_AURA) | 106 #if defined(USE_AURA) |
107 #include "ash/launcher/launcher.h" | 107 #include "ash/launcher/launcher.h" |
108 #include "ash/launcher/launcher_model.h" | 108 #include "ash/launcher/launcher_model.h" |
109 #include "ash/shell.h" | 109 #include "ash/shell.h" |
110 #include "chrome/browser/ui/views/accelerator_table.h" | 110 #include "chrome/browser/ui/views/accelerator_table.h" |
111 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 111 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
112 #include "chrome/browser/ui/views/aura/launcher/launcher_updater.h" | 112 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h" |
113 #include "ui/gfx/screen.h" | 113 #include "ui/gfx/screen.h" |
114 #elif defined(OS_WIN) | 114 #elif defined(OS_WIN) |
115 #include "chrome/browser/aeropeek_manager.h" | 115 #include "chrome/browser/aeropeek_manager.h" |
116 #include "chrome/browser/jumplist_win.h" | 116 #include "chrome/browser/jumplist_win.h" |
117 #include "ui/base/message_box_win.h" | 117 #include "ui/base/message_box_win.h" |
118 #include "ui/views/widget/native_widget_win.h" | 118 #include "ui/views/widget/native_widget_win.h" |
119 #elif defined(TOOLKIT_USES_GTK) | 119 #elif defined(TOOLKIT_USES_GTK) |
120 #include "chrome/browser/ui/views/accelerator_table.h" | 120 #include "chrome/browser/ui/views/accelerator_table.h" |
121 #endif | 121 #endif |
122 | 122 |
(...skipping 2437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2560 browser::CreateViewsBubble(bubble); | 2560 browser::CreateViewsBubble(bubble); |
2561 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2561 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2562 bubble->Show(); | 2562 bubble->Show(); |
2563 } | 2563 } |
2564 | 2564 |
2565 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2565 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
2566 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2566 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
2567 if (button) | 2567 if (button) |
2568 button->ShowAvatarBubble(); | 2568 button->ShowAvatarBubble(); |
2569 } | 2569 } |
OLD | NEW |