| 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 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1131 download_shelf_->set_parent_owned(false); | 1131 download_shelf_->set_parent_owned(false); |
| 1132 } | 1132 } |
| 1133 return download_shelf_.get(); | 1133 return download_shelf_.get(); |
| 1134 #endif | 1134 #endif |
| 1135 } | 1135 } |
| 1136 | 1136 |
| 1137 void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { | 1137 void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { |
| 1138 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); | 1138 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 void BrowserView::ShowCollectedCookiesDialog(TabContents* tab_contents) { | 1141 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { |
| 1142 browser::ShowCollectedCookiesDialog(GetNativeHandle(), tab_contents); | 1142 browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper); |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 void BrowserView::ShowThemeInstallBubble() { | 1145 void BrowserView::ShowThemeInstallBubble() { |
| 1146 TabContents* tab_contents = browser_->GetSelectedTabContents(); | 1146 TabContents* tab_contents = browser_->GetSelectedTabContents(); |
| 1147 if (!tab_contents) | 1147 if (!tab_contents) |
| 1148 return; | 1148 return; |
| 1149 ThemeInstallBubbleView::Show(tab_contents); | 1149 ThemeInstallBubbleView::Show(tab_contents); |
| 1150 } | 1150 } |
| 1151 | 1151 |
| 1152 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { | 1152 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { |
| (...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2674 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2674 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2675 // Create the view and the frame. The frame will attach itself via the view | 2675 // Create the view and the frame. The frame will attach itself via the view |
| 2676 // so we don't need to do anything with the pointer. | 2676 // so we don't need to do anything with the pointer. |
| 2677 BrowserView* view = new BrowserView(browser); | 2677 BrowserView* view = new BrowserView(browser); |
| 2678 (new BrowserFrame(view))->InitBrowserFrame(); | 2678 (new BrowserFrame(view))->InitBrowserFrame(); |
| 2679 view->GetWidget()->non_client_view()->SetAccessibleName( | 2679 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2680 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2680 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2681 return view; | 2681 return view; |
| 2682 } | 2682 } |
| 2683 #endif | 2683 #endif |
| OLD | NEW |