| 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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1121 return NULL; | 1121 return NULL; |
| 1122 #else | 1122 #else |
| 1123 if (!download_shelf_.get()) { | 1123 if (!download_shelf_.get()) { |
| 1124 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); | 1124 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); |
| 1125 download_shelf_->set_parent_owned(false); | 1125 download_shelf_->set_parent_owned(false); |
| 1126 } | 1126 } |
| 1127 return download_shelf_.get(); | 1127 return download_shelf_.get(); |
| 1128 #endif | 1128 #endif |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { | 1131 void BrowserView::ShowTabModalDialog(TabModalDialogDelegate* delegate, |
| 1132 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); | 1132 TabContents* tab_contents) { |
| 1133 browser::ShowTabModalDialog(delegate, GetNativeHandle(), tab_contents); |
| 1133 } | 1134 } |
| 1134 | 1135 |
| 1135 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { | 1136 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { |
| 1136 browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper); | 1137 browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper); |
| 1137 } | 1138 } |
| 1138 | 1139 |
| 1139 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { | 1140 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { |
| 1140 DownloadInProgressDialogView* view = | 1141 DownloadInProgressDialogView* view = |
| 1141 new DownloadInProgressDialogView(browser_.get()); | 1142 new DownloadInProgressDialogView(browser_.get()); |
| 1142 browser::CreateViewsWindow(GetNativeHandle(), view, STYLE_GENERIC)->Show(); | 1143 browser::CreateViewsWindow(GetNativeHandle(), view, STYLE_GENERIC)->Show(); |
| (...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2638 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); | 2639 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); |
| 2639 views::BubbleDelegateView::CreateBubble(bubble); | 2640 views::BubbleDelegateView::CreateBubble(bubble); |
| 2640 bubble->Show(); | 2641 bubble->Show(); |
| 2641 } | 2642 } |
| 2642 | 2643 |
| 2643 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2644 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2644 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2645 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2645 if (button) | 2646 if (button) |
| 2646 button->ShowAvatarBubble(); | 2647 button->ShowAvatarBubble(); |
| 2647 } | 2648 } |
| OLD | NEW |