views: Initialize message_box_title_ in the initalizer list.

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/views/simple_message_box_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/ui/dialog_style.h"
@@ skipping 62 matching lines @@
 
   g_browser_process->ReleaseModule();
 
   return dialog->accepted();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, private:
 
 int SimpleMessageBoxViews::GetDialogButtons() const {
-  if (type_ == DIALOG_ERROR)
+  if (dialog_type_ == DIALOG_ERROR)
     return ui::DIALOG_BUTTON_OK;
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 string16 SimpleMessageBoxViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
       IDS_OK : IDS_CLOSE);
 }
 
 bool SimpleMessageBoxViews::Cancel() {
-  disposition_ = DISPOSITION_CANCEL;
+  disposition_type_ = DISPOSITION_CANCEL;
   return true;
 }
 
 bool SimpleMessageBoxViews::Accept() {
-  disposition_ = DISPOSITION_OK;
+  disposition_type_ = DISPOSITION_OK;
   return true;
 }
 
 string16 SimpleMessageBoxViews::GetWindowTitle() const {
-  return message_box_title_;
+  return window_title_;
 }
 
 void SimpleMessageBoxViews::DeleteDelegate() {
   Release();
 }
 
 ui::ModalType SimpleMessageBoxViews::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 views::View* SimpleMessageBoxViews::GetContentsView() {
   return message_box_view_;
 }
 
 views::Widget* SimpleMessageBoxViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* SimpleMessageBoxViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 SimpleMessageBoxViews::SimpleMessageBoxViews(gfx::NativeWindow parent_window,
-                                             DialogType type,
+                                             DialogType dialog_type,
                                              const string16& title,
                                              const string16& message)
-    : type_(type),
-      disposition_(DISPOSITION_UNKNOWN) {
-  message_box_title_ = title;
+    : dialog_type_(dialog_type),
+      disposition_type_(DISPOSITION_UNKNOWN),
+      window_title_(title) {
   message_box_view_ = new views::MessageBoxView(

[Peter Kasting, 2012/04/13 09:12:32]

Nit: Why not init this in the initializer list too?

-      views::MessageBoxView::NO_OPTIONS,
-      message,
-      string16());
+      views::MessageBoxView::NO_OPTIONS, message, string16());
   views::Widget::CreateWindowWithParent(this, parent_window)->Show();
 
   // Add reference to be released in DeleteDelegate().
   AddRef();
 }
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
 bool SimpleMessageBoxViews::Dispatch(const base::NativeEvent& event) {
 #if defined(OS_WIN)
   TranslateMessage(&event);
   DispatchMessage(&event);
 #elif defined(USE_AURA)
   aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
 #endif
-  return disposition_ == DISPOSITION_UNKNOWN;
+  return disposition_type_ == DISPOSITION_UNKNOWN;
 }