OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/frame/browser_view.h" | 5 #include "chrome/browser/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 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 new DownloadInProgressConfirmDialogDelegate(browser_.get()); | 1060 new DownloadInProgressConfirmDialogDelegate(browser_.get()); |
1061 views::Window::CreateChromeWindow(GetNativeHandle(), gfx::Rect(), | 1061 views::Window::CreateChromeWindow(GetNativeHandle(), gfx::Rect(), |
1062 delegate)->Show(); | 1062 delegate)->Show(); |
1063 } | 1063 } |
1064 | 1064 |
1065 void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, | 1065 void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, |
1066 gfx::NativeWindow parent_window) { | 1066 gfx::NativeWindow parent_window) { |
1067 // Default to using our window as the parent if the argument is not specified. | 1067 // Default to using our window as the parent if the argument is not specified. |
1068 gfx::NativeWindow parent = parent_window ? parent_window | 1068 gfx::NativeWindow parent = parent_window ? parent_window |
1069 : GetNativeHandle(); | 1069 : GetNativeHandle(); |
1070 browser::ShowHtmlDialogView(parent, browser_.get(), delegate); | 1070 browser::ShowHtmlDialogView(parent, browser_.get()->profile(), delegate); |
1071 } | 1071 } |
1072 | 1072 |
1073 void BrowserView::ShowCreateShortcutsDialog(TabContents* tab_contents) { | 1073 void BrowserView::ShowCreateShortcutsDialog(TabContents* tab_contents) { |
1074 browser::ShowCreateShortcutsDialog(GetNativeHandle(), tab_contents); | 1074 browser::ShowCreateShortcutsDialog(GetNativeHandle(), tab_contents); |
1075 } | 1075 } |
1076 | 1076 |
1077 void BrowserView::ContinueDraggingDetachedTab(const gfx::Rect& tab_bounds) { | 1077 void BrowserView::ContinueDraggingDetachedTab(const gfx::Rect& tab_bounds) { |
1078 tabstrip_->SetDraggedTabBounds(0, tab_bounds); | 1078 tabstrip_->SetDraggedTabBounds(0, tab_bounds); |
1079 frame_->ContinueDraggingDetachedTab(); | 1079 frame_->ContinueDraggingDetachedTab(); |
1080 } | 1080 } |
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2237 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2237 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2238 | 2238 |
2239 return view; | 2239 return view; |
2240 } | 2240 } |
2241 #endif | 2241 #endif |
2242 | 2242 |
2243 // static | 2243 // static |
2244 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2244 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2245 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2245 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2246 } | 2246 } |
OLD | NEW |