Parent SSL certs window properly in win aura

chrome/browser/ui/webui/options/advanced_options_utils_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 #include <shellapi.h>
 
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
+#include "ui/views/win/hwnd_util.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
 namespace options {
 
 // Callback that opens the Internet Options control panel dialog with the
 // Connections tab selected.
 void OpenConnectionDialogCallback() {
   // Using rundll32 seems better than LaunchConnectionDialog which causes a
@@ skipping 24 matching lines @@
   DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::FILE));
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&OpenConnectionDialogCallback));
 }
 
 void AdvancedOptionsUtilities::ShowManageSSLCertificates(
       WebContents* web_contents) {
   CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 };
   cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);
-  cert_mgr.hwndParent =
+  gfx::NativeWindow top_level_window =
+      web_contents->GetView()->GetTopLevelNativeWindow();
 #if defined(USE_AURA)

[sky, 2013/09/16 16:59:29]

Can you use views::HWNDForNativeView to avoid the ifdefs?

[scottmg, 2013/09/16 17:26:38]

Oops, didn't realize those were implemented for non-aura. Done.

-      NULL;
+  cert_mgr.hwndParent = views::HWNDForNativeWindow(top_level_window);
 #else
-      web_contents->GetView()->GetTopLevelNativeWindow();
+  cert_mgr.hwndParent = top_level_window;
 #endif
   ::CryptUIDlgCertMgr(&cert_mgr);
 }
 
 }  // namespace options