Fix incorrect use of AXState caused when refactoring two enums into one.

ui/views/controls/button/menu_button.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 "ui/views/controls/button/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 226 matching lines @@
   // Override CustomButton's implementation, which presses the button when
   // you press space and clicks it when you release space.  For a MenuButton
   // we always activate the menu on key press.
   return false;
 }
 
 void MenuButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_POP_UP_BUTTON;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
-  state->state = ui::AX_STATE_HASPOPUP;
+  state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   // We can not use the views' mirroring infrastructure for mirroring a
   // MenuButton control (see TextButton::OnPaint() for a detailed explanation
   // regarding why we can not flip the canvas). Therefore, we need to
   // manually mirror the position of the down arrow.
   gfx::Rect arrow_bounds(width() - insets.right() -
                          menu_marker_->width() - kMenuMarkerPaddingRight,
                          height() / 2 - menu_marker_->height() / 2,
                          menu_marker_->width(),
                          menu_marker_->height());
   arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
   canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
 }
 
 int MenuButton::GetMaximumScreenXCoordinate() {
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views