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

Side by Side Diff: chrome/browser/ui/views/certificate_viewer_win.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/certificate_viewer.h" 5 #include "chrome/browser/certificate_viewer.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <cryptuiapi.h> 8 #include <cryptuiapi.h>
9 #pragma comment(lib, "cryptui.lib") 9 #pragma comment(lib, "cryptui.lib")
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 } // namespace 50 } // namespace
51 51
52 #if defined(USE_AURA) 52 #if defined(USE_AURA)
53 void ShowCertificateViewer(content::WebContents* web_contents, 53 void ShowCertificateViewer(content::WebContents* web_contents,
54 gfx::NativeWindow parent, 54 gfx::NativeWindow parent,
55 net::X509Certificate* cert) { 55 net::X509Certificate* cert) {
56 if (chrome::GetHostDesktopTypeForNativeWindow(parent) != 56 if (chrome::GetHostDesktopTypeForNativeWindow(parent) !=
57 chrome::HOST_DESKTOP_TYPE_ASH) { 57 chrome::HOST_DESKTOP_TYPE_ASH) {
58 ShowCertificateViewerImpl( 58 ShowCertificateViewerImpl(
59 web_contents, parent->GetRootWindow()->GetAcceleratedWidget(), cert); 59 web_contents, parent->GetDispatcher()->GetAcceleratedWidget(), cert);
60 } else { 60 } else {
61 NOTIMPLEMENTED(); 61 NOTIMPLEMENTED();
62 } 62 }
63 } 63 }
64 #else 64 #else
65 void ShowCertificateViewer(content::WebContents* web_contents, 65 void ShowCertificateViewer(content::WebContents* web_contents,
66 gfx::NativeWindow parent, 66 gfx::NativeWindow parent,
67 net::X509Certificate* cert) { 67 net::X509Certificate* cert) {
68 ShowCertificateViewerImpl(web_contents, parent, cert); 68 ShowCertificateViewerImpl(web_contents, parent, cert);
69 } 69 }
70 #endif 70 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc ('k') | chrome/browser/ui/views/desktop_media_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698