Make the toast more reliable and less dangerous...

chrome/browser/first_run/first_run_win.cc

 // Copyright (c) 2011 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/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 604 matching lines @@
         kill_chrome_(NULL),
         result_(Upgrade::TD_LAST_ENUM) {
   }
 
   virtual ~TryChromeDialog() {
   };
 
   // Shows the modal dialog asking the user to try chrome. Note that the dialog
   // has no parent and it will position itself in a lower corner of the screen.
   // The dialog does not steal focus and does not have an entry in the taskbar.
-  Upgrade::TryResult ShowModal() {
+  Upgrade::TryResult ShowModal(ProcessSingleton* process_singleton) {
     using views::GridLayout;
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     views::ImageView* icon = new views::ImageView();
     icon->SetImage(*rb.GetBitmapNamed(IDR_PRODUCT_ICON_32));
     gfx::Size icon_size = icon->GetPreferredSize();
 
     // An approximate window size. After Layout() we'll get better bounds.
     gfx::Rect pos(310, 160);
     views::WidgetWin* popup = new views::WidgetWin();
     if (!popup) {
       NOTREACHED();
       return Upgrade::TD_DIALOG_ERROR;
     }
+
     popup->set_delete_on_destroy(true);
     popup->set_window_style(WS_POPUP | WS_CLIPCHILDREN);
     popup->set_window_ex_style(WS_EX_TOOLWINDOW);
     popup->Init(NULL, pos);
 
     views::RootView* root_view = popup->GetRootView();
     // The window color is a tiny bit off-white.
     root_view->set_background(
         views::Background::CreateSolidBackground(0xfc, 0xfc, 0xfc));
 
@@ skipping 110 matching lines @@
     // account the differences between XP and Vista fonts and buttons.
     layout->Layout(root_view);
     gfx::Size preferred = layout->GetPreferredSize(root_view);
     pos = ComputeWindowPosition(preferred.width(), preferred.height(),
                                 base::i18n::IsRTL());
     popup->SetBounds(pos);
 
     // Carve the toast shape into the window.
     SetToastRegion(popup->GetNativeView(),
                    preferred.width(), preferred.height());
-    // Time to show the window in a modal loop.
     popup_ = popup;
+
+    // Time to show the window in a modal loop. We don't want this chrome
+    // instance trying to serve WM_COPYDATA requests, as we'll surely crash.
+    process_singleton->Lock(popup->GetNativeView());
     popup_->Show();
     MessageLoop::current()->Run();
+    process_singleton->Unlock();
     return result_;
   }
 
  protected:
   // Overridden from ButtonListener. We have two buttons and according to
   // what the user clicked we set |result_| and we should always close and
   // end the modal loop.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
     if (sender->tag() == BT_CLOSE_BUTTON) {
       // The user pressed cancel or the [x] button.
@@ skipping 68 matching lines @@
   views::WidgetWin* popup_;
   views::RadioButton* try_chrome_;
   views::RadioButton* kill_chrome_;
   Upgrade::TryResult result_;
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
-Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
+Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version,

[Finnur, 2011/03/07 22:35:10]

nit: move param |version| down to the line below.

+    ProcessSingleton* process_singleton) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td(version);
-  return td.ShowModal();
+  return td.ShowModal(process_singleton);
 }