Merge 182274

chrome/browser/ui/views/extensions/extension_install_dialog_view.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 <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
@@ skipping 77 matching lines @@
                              ExtensionInstallPrompt::Delegate* delegate,
                              const ExtensionInstallPrompt::Prompt& prompt);
   virtual ~ExtensionInstallDialogView();
 
   // Changes the size of the containing widget to match the preferred size
   // of this dialog.
   void SizeToContents();
 
  private:
   // views::DialogDelegateView:
-  virtual int GetDialogButtons() const OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
 
   // views::LinkListener:
@@ skipping 328 matching lines @@
     }
   }
 }
 
 ExtensionInstallDialogView::~ExtensionInstallDialogView() {}
 
 void ExtensionInstallDialogView::SizeToContents() {
   GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
-int ExtensionInstallDialogView::GetDialogButtons() const {
-  int buttons = prompt_.GetDialogButtons();
-  // Simply having just an OK button is *not* supported. See comment on function
-  // GetDialogButtons in dialog_delegate.h for reasons.
-  DCHECK_GT(buttons & ui::DIALOG_BUTTON_CANCEL, 0);
-  return buttons;
-}
-
 string16 ExtensionInstallDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
       return prompt_.GetAcceptButtonLabel();
     case ui::DIALOG_BUTTON_CANCEL:
       return prompt_.HasAbortButtonLabel() ?
           prompt_.GetAbortButtonLabel() :
           l10n_util::GetStringUTF16(IDS_CANCEL);
     default:
@@ skipping 166 matching lines @@
       rotate.Translate(-arrow_view_->width() / 2.0,
                        -arrow_view_->height() / 2.0);
     }
     arrow_view_->SetTransform(rotate);
   }
 }
 
 void IssueAdviceView::ChildPreferredSizeChanged(views::View* child) {
   owner_->SizeToContents();
 }