views: Make SimpleMessageBoxViews::GetDialogButtons() more readable.

chrome/browser/ui/views/simple_message_box_views.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/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/views/window.h"
@@ skipping 68 matching lines @@
 }
 
 bool SimpleMessageBoxViews::Accept() {
   disposition_ = DISPOSITION_OK;
   return true;
 }
 
 int SimpleMessageBoxViews::GetDialogButtons() const {
   // NOTE: It seems unsafe to assume that the flags for OK/cancel will always
   // have the same value as the button ids.
-  return (dialog_flags_ & ui::MessageBoxFlags::kFlagHasOKButton
-      ? ui::DIALOG_BUTTON_OK : 0) |
-      (dialog_flags_ & ui::MessageBoxFlags::kFlagHasCancelButton
-          ? ui::DIALOG_BUTTON_CANCEL : 0);
+  int dialog_buttons = ui::DIALOG_BUTTON_NONE;
+  if (dialog_flags_ & ui::MessageBoxFlags::kFlagHasOKButton)
+    dialog_buttons = ui::DIALOG_BUTTON_OK;
+
+  if (dialog_flags_ & ui::MessageBoxFlags::kFlagHasCancelButton)
+    dialog_buttons |= ui::DIALOG_BUTTON_CANCEL;
+
+  return dialog_buttons;
 }
 
 string16 SimpleMessageBoxViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? l10n_util::GetStringUTF16(IDS_OK)
                                         : l10n_util::GetStringUTF16(IDS_CLOSE);
 }
 
 bool SimpleMessageBoxViews::ShouldShowWindowTitle() const {
   return true;
@@ skipping 60 matching lines @@
   if (disposition_ == DISPOSITION_UNKNOWN)
     return base::MessagePumpDispatcher::EVENT_PROCESSED;
   return base::MessagePumpDispatcher::EVENT_QUIT;
 }
 #else
 bool SimpleMessageBoxViews::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return disposition_ == DISPOSITION_UNKNOWN;
 }
 #endif