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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1160 // Default to using our window as the parent if the argument is not specified. | 1160 // Default to using our window as the parent if the argument is not specified. |
1161 gfx::NativeWindow parent = parent_window ? parent_window | 1161 gfx::NativeWindow parent = parent_window ? parent_window |
1162 : GetNativeHandle(); | 1162 : GetNativeHandle(); |
1163 #if defined(OS_CHROMEOS) | 1163 #if defined(OS_CHROMEOS) |
1164 parent = GetNormalBrowserWindowForBrowser(browser(), NULL); | 1164 parent = GetNormalBrowserWindowForBrowser(browser(), NULL); |
1165 #endif // defined(OS_CHROMEOS) | 1165 #endif // defined(OS_CHROMEOS) |
1166 | 1166 |
1167 browser::ShowHtmlDialogView(parent, browser_.get()->profile(), delegate); | 1167 browser::ShowHtmlDialogView(parent, browser_.get()->profile(), delegate); |
1168 } | 1168 } |
1169 | 1169 |
1170 void BrowserView::ShowCreateShortcutsDialog(TabContents* tab_contents) { | 1170 void BrowserView::ShowCreateWebAppShortcutsDialog(TabContents* tab_contents) { |
1171 browser::ShowCreateShortcutsDialog(GetNativeHandle(), tab_contents); | 1171 browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents); |
| 1172 } |
| 1173 |
| 1174 void BrowserView::ShowCreateChromeAppShortcutsDialog(Profile* profile, |
| 1175 const Extension* app) { |
| 1176 browser::ShowCreateChromeAppShortcutsDialog(GetNativeHandle(), profile, app); |
1172 } | 1177 } |
1173 | 1178 |
1174 void BrowserView::UserChangedTheme() { | 1179 void BrowserView::UserChangedTheme() { |
1175 frame_->GetWindow()->FrameTypeChanged(); | 1180 frame_->GetWindow()->FrameTypeChanged(); |
1176 } | 1181 } |
1177 | 1182 |
1178 int BrowserView::GetExtraRenderViewHeight() const { | 1183 int BrowserView::GetExtraRenderViewHeight() const { |
1179 // Currently this is only used on linux. | 1184 // Currently this is only used on linux. |
1180 return 0; | 1185 return 0; |
1181 } | 1186 } |
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2493 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2498 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2494 | 2499 |
2495 return view; | 2500 return view; |
2496 } | 2501 } |
2497 #endif | 2502 #endif |
2498 | 2503 |
2499 // static | 2504 // static |
2500 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2505 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2501 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2506 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2502 } | 2507 } |
OLD | NEW |