Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Side by Side Diff: chrome/browser/views/frame/browser_view.cc

Issue 3136027: First pass at convert the SSL dialogs into InfoBubbles.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/page_info_window.h ('k') | chrome/browser/views/page_info_bubble_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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)
1269 browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history);
1270 #else
1268 browser::ShowPageInfo(parent, profile, url, ssl, show_history); 1271 browser::ShowPageInfo(parent, profile, url, ssl, show_history);
1272 #endif
1269 } 1273 }
1270 1274
1271 void BrowserView::ShowAppMenu() { 1275 void BrowserView::ShowAppMenu() {
1272 toolbar_->app_menu()->Activate(); 1276 toolbar_->app_menu()->Activate();
1273 } 1277 }
1274 1278
1275 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 1279 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
1276 bool* is_keyboard_shortcut) { 1280 bool* is_keyboard_shortcut) {
1277 if (event.type != WebKit::WebInputEvent::RawKeyDown) 1281 if (event.type != WebKit::WebInputEvent::RawKeyDown)
1278 return false; 1282 return false;
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
2512 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); 2516 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
2513 2517
2514 return view; 2518 return view;
2515 } 2519 }
2516 #endif 2520 #endif
2517 2521
2518 // static 2522 // static
2519 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2523 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2520 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2524 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2521 } 2525 }
OLDNEW
« no previous file with comments | « chrome/browser/page_info_window.h ('k') | chrome/browser/views/page_info_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698