Fixed screen capture confirmation dialog to be either system or browser window modal.

chrome/browser/ui/views/simple_message_box_views.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/simple_message_box.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 class SimpleMessageBoxViews : public views::DialogDelegate {
  public:
   SimpleMessageBoxViews(const base::string16& title,
                         const base::string16& message,
                         MessageBoxType type,
                         const base::string16& yes_text,
                         const base::string16& no_text,
+                        bool is_system_modal,
                         MessageBoxResult* result);
   virtual ~SimpleMessageBoxViews();
 
   // Overridden from views::DialogDelegate:
   virtual int GetDialogButtons() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // Overridden from views::WidgetDelegate:
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
  private:
 
   // This terminates the nested message-loop.
   void Done();
 
   const base::string16 window_title_;
   const MessageBoxType type_;
   base::string16 yes_text_;
   base::string16 no_text_;
   MessageBoxResult* result_;
+  bool is_system_modal_;
   views::MessageBoxView* message_box_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMessageBoxViews);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, public:
 
 SimpleMessageBoxViews::SimpleMessageBoxViews(const base::string16& title,
                                              const base::string16& message,
                                              MessageBoxType type,
                                              const base::string16& yes_text,
                                              const base::string16& no_text,
+                                             bool is_system_modal,
                                              MessageBoxResult* result)
     : window_title_(title),
       type_(type),
       yes_text_(yes_text),
       no_text_(no_text),
       result_(result),
+      is_system_modal_(is_system_modal),
       message_box_view_(new views::MessageBoxView(
           views::MessageBoxView::InitParams(message))) {
   CHECK(result_);
   if (yes_text_.empty()) {
     if (type_ == MESSAGE_BOX_TYPE_QUESTION)
       yes_text_ =
           l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL);
     else if (type_ == MESSAGE_BOX_TYPE_OK_CANCEL)
       yes_text_ = l10n_util::GetStringUTF16(IDS_OK);
     else
@@ skipping 42 matching lines @@
 
 base::string16 SimpleMessageBoxViews::GetWindowTitle() const {
   return window_title_;
 }
 
 void SimpleMessageBoxViews::DeleteDelegate() {
   delete this;
 }
 
 ui::ModalType SimpleMessageBoxViews::GetModalType() const {
-  return ui::MODAL_TYPE_WINDOW;
+  return is_system_modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_WINDOW;
 }
 
 views::View* SimpleMessageBoxViews::GetContentsView() {
   return message_box_view_;
 }
 
 views::Widget* SimpleMessageBoxViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
@@ skipping 46 matching lines @@
         MESSAGE_BOX_RESULT_YES : MESSAGE_BOX_RESULT_NO;
 #else
     LOG(ERROR) << "Unable to show a dialog outside the UI thread message loop: "
                << title << " - " << message;
     return MESSAGE_BOX_RESULT_NO;
 #endif
   }
 
   MessageBoxResult result = MESSAGE_BOX_RESULT_NO;
   SimpleMessageBoxViews* dialog = new SimpleMessageBoxViews(
-      title, message, type, yes_text, no_text, &result);
+      title,
+      message,
+      type,
+      yes_text,
+      no_text,
+      parent == NULL,  // is_system_modal
+      &result);
   CreateBrowserModalDialogViews(dialog, parent)->Show();
 
   // Use the widget's window itself so that the message loop exists when the
   // dialog is closed by some other means than |Cancel| or |Accept|.
   aura::Window* anchor = dialog->GetWidget()->GetNativeWindow();
   aura::client::DispatcherClient* client =
       aura::client::GetDispatcherClient(anchor->GetRootWindow());
   client->RunWithDispatcher(NULL);
   // NOTE: |dialog| will have been deleted by the time control returns here.
 
@@ skipping 13 matching lines @@
 MessageBoxResult ShowMessageBoxWithButtonText(gfx::NativeWindow parent,
                                               const base::string16& title,
                                               const base::string16& message,
                                               const base::string16& yes_text,
                                               const base::string16& no_text) {
   return ShowMessageBoxImpl(
       parent, title, message, MESSAGE_BOX_TYPE_QUESTION, yes_text, no_text);
 }
 
 }  // namespace chrome