| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/ash/chrome_shell_delegate.h" | 111 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
| 112 #include "chrome/browser/ui/views/ash/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" | |
| 118 #include "ui/views/widget/native_widget_win.h" | 117 #include "ui/views/widget/native_widget_win.h" |
| 119 #elif defined(TOOLKIT_USES_GTK) | 118 #elif defined(TOOLKIT_USES_GTK) |
| 120 #include "chrome/browser/ui/views/accelerator_table.h" | 119 #include "chrome/browser/ui/views/accelerator_table.h" |
| 121 #endif | 120 #endif |
| 122 | 121 |
| 123 #if defined(OS_CHROMEOS) | 122 #if defined(OS_CHROMEOS) |
| 124 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 123 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
| 125 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 124 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
| 126 #endif | 125 #endif |
| 127 | 126 |
| (...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2569 browser::CreateViewsBubble(bubble); | 2568 browser::CreateViewsBubble(bubble); |
| 2570 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2569 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2571 bubble->Show(); | 2570 bubble->Show(); |
| 2572 } | 2571 } |
| 2573 | 2572 |
| 2574 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2573 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2575 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2574 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2576 if (button) | 2575 if (button) |
| 2577 button->ShowAvatarBubble(); | 2576 button->ShowAvatarBubble(); |
| 2578 } | 2577 } |
| OLD | NEW |