| 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 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1195 void BrowserView::TabContentsFocused(TabContents* tab_contents) { | 1195 void BrowserView::TabContentsFocused(TabContents* tab_contents) { |
| 1196 contents_container_->TabContentsFocused(tab_contents); | 1196 contents_container_->TabContentsFocused(tab_contents); |
| 1197 } | 1197 } |
| 1198 | 1198 |
| 1199 void BrowserView::ShowPageInfo(Profile* profile, | 1199 void BrowserView::ShowPageInfo(Profile* profile, |
| 1200 const GURL& url, | 1200 const GURL& url, |
| 1201 const NavigationEntry::SSLStatus& ssl, | 1201 const NavigationEntry::SSLStatus& ssl, |
| 1202 bool show_history) { | 1202 bool show_history) { |
| 1203 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); | 1203 gfx::NativeWindow parent = GetWindow()->GetNativeWindow(); |
| 1204 | 1204 |
| 1205 #if defined(OS_CHROMEOS) | |
| 1206 parent = GetNormalBrowserWindowForBrowser(browser(), profile); | |
| 1207 #endif // defined(OS_CHROMEOS) | |
| 1208 | |
| 1209 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); | 1205 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history); |
| 1210 } | 1206 } |
| 1211 | 1207 |
| 1212 void BrowserView::ShowAppMenu() { | 1208 void BrowserView::ShowAppMenu() { |
| 1213 toolbar_->app_menu()->Activate(); | 1209 toolbar_->app_menu()->Activate(); |
| 1214 } | 1210 } |
| 1215 | 1211 |
| 1216 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 1212 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
| 1217 bool* is_keyboard_shortcut) { | 1213 bool* is_keyboard_shortcut) { |
| 1218 if (event.type != WebKit::WebInputEvent::RawKeyDown) | 1214 if (event.type != WebKit::WebInputEvent::RawKeyDown) |
| (...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2573 UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 2569 UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 2574 | 2570 |
| 2575 return view; | 2571 return view; |
| 2576 } | 2572 } |
| 2577 #endif | 2573 #endif |
| 2578 | 2574 |
| 2579 // static | 2575 // static |
| 2580 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2576 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2581 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2577 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2582 } | 2578 } |
| OLD | NEW |