| 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 26 matching lines...) Expand all Loading... |
| 37 #include "chrome/browser/sessions/tab_restore_service.h" | 37 #include "chrome/browser/sessions/tab_restore_service.h" |
| 38 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 38 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 39 #include "chrome/browser/sidebar/sidebar_container.h" | 39 #include "chrome/browser/sidebar/sidebar_container.h" |
| 40 #include "chrome/browser/sidebar/sidebar_manager.h" | 40 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 41 #include "chrome/browser/tabs/tab_strip_model.h" | 41 #include "chrome/browser/tabs/tab_strip_model.h" |
| 42 #include "chrome/browser/themes/theme_service.h" | 42 #include "chrome/browser/themes/theme_service.h" |
| 43 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" | 43 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" |
| 44 #include "chrome/browser/ui/browser.h" | 44 #include "chrome/browser/ui/browser.h" |
| 45 #include "chrome/browser/ui/browser_dialogs.h" | 45 #include "chrome/browser/ui/browser_dialogs.h" |
| 46 #include "chrome/browser/ui/browser_list.h" | 46 #include "chrome/browser/ui/browser_list.h" |
| 47 #include "chrome/browser/ui/dialog_style.h" |
| 47 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 48 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 48 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 49 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
| 49 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 50 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 50 #include "chrome/browser/ui/view_ids.h" | 51 #include "chrome/browser/ui/view_ids.h" |
| 51 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" | 52 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" |
| 52 #include "chrome/browser/ui/views/avatar_menu_button.h" | 53 #include "chrome/browser/ui/views/avatar_menu_button.h" |
| 53 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 54 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 54 #include "chrome/browser/ui/views/browser_dialogs.h" | 55 #include "chrome/browser/ui/views/browser_dialogs.h" |
| 55 #include "chrome/browser/ui/views/default_search_view.h" | 56 #include "chrome/browser/ui/views/default_search_view.h" |
| 56 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 57 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
| (...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1112 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); | 1113 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); |
| 1113 } | 1114 } |
| 1114 | 1115 |
| 1115 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { | 1116 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { |
| 1116 browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper); | 1117 browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper); |
| 1117 } | 1118 } |
| 1118 | 1119 |
| 1119 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { | 1120 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { |
| 1120 DownloadInProgressDialogView* view = | 1121 DownloadInProgressDialogView* view = |
| 1121 new DownloadInProgressDialogView(browser_.get()); | 1122 new DownloadInProgressDialogView(browser_.get()); |
| 1122 browser::CreateViewsWindow(GetNativeHandle(), view)->Show(); | 1123 browser::CreateViewsWindow(GetNativeHandle(), view, STYLE_GENERIC)->Show(); |
| 1123 } | 1124 } |
| 1124 | 1125 |
| 1125 void BrowserView::ShowCreateWebAppShortcutsDialog( | 1126 void BrowserView::ShowCreateWebAppShortcutsDialog( |
| 1126 TabContentsWrapper* tab_contents) { | 1127 TabContentsWrapper* tab_contents) { |
| 1127 browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents); | 1128 browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents); |
| 1128 } | 1129 } |
| 1129 | 1130 |
| 1130 void BrowserView::ShowCreateChromeAppShortcutsDialog(Profile* profile, | 1131 void BrowserView::ShowCreateChromeAppShortcutsDialog(Profile* profile, |
| 1131 const Extension* app) { | 1132 const Extension* app) { |
| 1132 browser::ShowCreateChromeAppShortcutsDialog(GetNativeHandle(), profile, app); | 1133 browser::ShowCreateChromeAppShortcutsDialog(GetNativeHandle(), profile, app); |
| (...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2620 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, | 2621 Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT, |
| 2621 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, | 2622 views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, |
| 2622 bubble_view, bubble_view); | 2623 bubble_view, bubble_view); |
| 2623 } | 2624 } |
| 2624 | 2625 |
| 2625 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2626 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2626 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2627 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2627 if (button) | 2628 if (button) |
| 2628 button->ShowAvatarBubble(); | 2629 button->ShowAvatarBubble(); |
| 2629 } | 2630 } |
| OLD | NEW |