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 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1258 void BrowserView::ShowPageInfo(Profile* profile, | 1258 void BrowserView::ShowPageInfo(Profile* profile, |
1259 const GURL& url, | 1259 const GURL& url, |
1260 const NavigationEntry::SSLStatus& ssl, | 1260 const NavigationEntry::SSLStatus& ssl, |
1261 bool show_history) { | 1261 bool show_history) { |
1262 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); | 1262 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); |
1263 | 1263 |
1264 #if defined(OS_CHROMEOS) | 1264 #if defined(OS_CHROMEOS) |
1265 parent = GetNormalBrowserWindowForBrowser(browser(), profile); | 1265 parent = GetNormalBrowserWindowForBrowser(browser(), profile); |
1266 #endif // defined(OS_CHROMEOS) | 1266 #endif // defined(OS_CHROMEOS) |
1267 | 1267 |
1268 #if defined(OS_WINDOWS) | 1268 const CommandLine* command_line(CommandLine::ForCurrentProcess()); |
1269 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); | 1269 if (command_line->HasSwitch(switches::kEnableNewPageInfoBubble)) |
1270 #else | 1270 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); |
1271 browser::ShowPageInfo(parent, profile, url, ssl, show_history); | 1271 else |
1272 #endif | 1272 browser::ShowPageInfo(parent, profile, url, ssl, show_history); |
1273 } | 1273 } |
1274 | 1274 |
1275 void BrowserView::ShowAppMenu() { | 1275 void BrowserView::ShowAppMenu() { |
1276 toolbar_->app_menu()->Activate(); | 1276 toolbar_->app_menu()->Activate(); |
1277 } | 1277 } |
1278 | 1278 |
1279 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1279 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
1280 bool* is_keyboard_shortcut) { | 1280 bool* is_keyboard_shortcut) { |
1281 if (event.type != WebKit::WebInputEvent::RawKeyDown) | 1281 if (event.type != WebKit::WebInputEvent::RawKeyDown) |
1282 return false; | 1282 return false; |
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2516 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2516 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2517 | 2517 |
2518 return view; | 2518 return view; |
2519 } | 2519 } |
2520 #endif | 2520 #endif |
2521 | 2521 |
2522 // static | 2522 // static |
2523 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2523 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2524 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2524 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2525 } | 2525 } |
OLD | NEW |