| 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(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1100 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); | 1100 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); |
| 1101 download_shelf_->set_parent_owned(false); | 1101 download_shelf_->set_parent_owned(false); |
| 1102 } | 1102 } |
| 1103 return download_shelf_.get(); | 1103 return download_shelf_.get(); |
| 1104 } | 1104 } |
| 1105 | 1105 |
| 1106 void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { | 1106 void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { |
| 1107 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); | 1107 browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); |
| 1108 } | 1108 } |
| 1109 | 1109 |
| 1110 void BrowserView::ShowContentSettingsWindow(ContentSettingsType content_type, | |
| 1111 Profile* profile) { | |
| 1112 browser::ShowContentSettingsWindow(GetNativeHandle(), content_type, profile); | |
| 1113 } | |
| 1114 | |
| 1115 void BrowserView::ShowCollectedCookiesDialog(TabContents* tab_contents) { | 1110 void BrowserView::ShowCollectedCookiesDialog(TabContents* tab_contents) { |
| 1116 browser::ShowCollectedCookiesDialog(GetNativeHandle(), tab_contents); | 1111 browser::ShowCollectedCookiesDialog(GetNativeHandle(), tab_contents); |
| 1117 } | 1112 } |
| 1118 | 1113 |
| 1119 void BrowserView::ShowProfileErrorDialog(int message_id) { | 1114 void BrowserView::ShowProfileErrorDialog(int message_id) { |
| 1120 #if defined(OS_WIN) | 1115 #if defined(OS_WIN) |
| 1121 string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 1116 string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 1122 string16 message = l10n_util::GetStringUTF16(message_id); | 1117 string16 message = l10n_util::GetStringUTF16(message_id); |
| 1123 ui::MessageBox(GetNativeHandle(), message, title, | 1118 ui::MessageBox(GetNativeHandle(), message, title, |
| 1124 MB_OK | MB_ICONWARNING | MB_TOPMOST); | 1119 MB_OK | MB_ICONWARNING | MB_TOPMOST); |
| (...skipping 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2538 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2533 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2539 | 2534 |
| 2540 return view; | 2535 return view; |
| 2541 } | 2536 } |
| 2542 #endif | 2537 #endif |
| 2543 | 2538 |
| 2544 // static | 2539 // static |
| 2545 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2540 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2546 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2541 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2547 } | 2542 } |
| OLD | NEW |