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 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1205 const GURL& url, | 1205 const GURL& url, |
1206 const NavigationEntry::SSLStatus& ssl, | 1206 const NavigationEntry::SSLStatus& ssl, |
1207 bool show_history) { | 1207 bool show_history) { |
1208 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); | 1208 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); |
1209 | 1209 |
1210 #if defined(OS_CHROMEOS) | 1210 #if defined(OS_CHROMEOS) |
1211 parent = GetNormalBrowserWindowForBrowser(browser(), profile); | 1211 parent = GetNormalBrowserWindowForBrowser(browser(), profile); |
1212 #endif // defined(OS_CHROMEOS) | 1212 #endif // defined(OS_CHROMEOS) |
1213 | 1213 |
1214 const CommandLine* command_line(CommandLine::ForCurrentProcess()); | 1214 const CommandLine* command_line(CommandLine::ForCurrentProcess()); |
1215 if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble)) | 1215 if (!command_line->HasSwitch(switches::kDisableNewPageInfoBubble)) |
1216 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); | 1216 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); |
1217 else | 1217 else |
1218 browser::ShowPageInfo(parent, profile, url, ssl, show_history); | 1218 browser::ShowPageInfo(parent, profile, url, ssl, show_history); |
1219 } | 1219 } |
1220 | 1220 |
1221 void BrowserView::ShowAppMenu() { | 1221 void BrowserView::ShowAppMenu() { |
1222 toolbar_->app_menu()->Activate(); | 1222 toolbar_->app_menu()->Activate(); |
1223 } | 1223 } |
1224 | 1224 |
1225 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1225 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2454 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2454 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2455 | 2455 |
2456 return view; | 2456 return view; |
2457 } | 2457 } |
2458 #endif | 2458 #endif |
2459 | 2459 |
2460 // static | 2460 // static |
2461 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2461 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2462 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2462 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2463 } | 2463 } |
OLD | NEW |