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

Unified Diff: chrome/browser/views/tab_contents_container_view.cc

Issue 10973: Test the feasibility of turning Chrome into a multi-process ActiveX control Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/html_dialog_view.cc ('k') | chrome/browser/views/tabs/dragged_tab_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/tab_contents_container_view.cc
===================================================================
--- chrome/browser/views/tab_contents_container_view.cc (revision 5533)
+++ chrome/browser/views/tab_contents_container_view.cc (working copy)
@@ -37,15 +37,18 @@
// Hide the contents before adjusting its parent to avoid a full desktop
// flicker.
- ::ShowWindow(container_hwnd, SW_HIDE);
+ if(container_hwnd)
+ ::ShowWindow(container_hwnd, SW_HIDE);
// Reset the parent to NULL to ensure hidden tabs don't receive messages.
- ::SetParent(container_hwnd, NULL);
+ if(container_hwnd)
+ ::SetParent(container_hwnd, NULL);
tab_contents_->WasHidden();
// Unregister the tab contents window from the FocusManager.
- views::FocusManager::UninstallFocusSubclass(container_hwnd);
+ if(container_hwnd)
+ views::FocusManager::UninstallFocusSubclass(container_hwnd);
HWND hwnd = tab_contents_->GetContentHWND();
if (hwnd) {
// We may not have an HWND anymore, if the renderer crashed and we are
« no previous file with comments | « chrome/browser/views/html_dialog_view.cc ('k') | chrome/browser/views/tabs/dragged_tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698