Switch to standard integer types in ui/views/.

ui/views/controls/menu/menu_runner.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/views_export.h"
 
 namespace base {
 class TimeDelta;
 }
 
 namespace gfx {
@@ skipping 77 matching lines @@
   enum RunResult {
     // Indicates RunMenuAt is returning because the MenuRunner was deleted.
     MENU_DELETED,
 
     // Indicates RunMenuAt returned and MenuRunner was not deleted.
     NORMAL_EXIT
   };
 
   // Creates a new MenuRunner.
   // |run_types| is a bitmask of RunTypes.
-  MenuRunner(ui::MenuModel* menu_model, int32 run_types);
-  MenuRunner(MenuItemView* menu, int32 run_types);
+  MenuRunner(ui::MenuModel* menu_model, int32_t run_types);
+  MenuRunner(MenuItemView* menu, int32_t run_types);
   ~MenuRunner();
 
   // Runs the menu. If this returns MENU_DELETED the method is returning
   // because the MenuRunner was deleted.
   // Typically callers should NOT do any processing if this returns
   // MENU_DELETED.
   // If |anchor| uses a |BUBBLE_..| type, the bounds will get determined by
   // using |bounds| as the thing to point at in screen coordinates.
   RunResult RunMenuAt(Widget* parent,
                       MenuButton* button,
                       const gfx::Rect& bounds,
                       MenuAnchorPosition anchor,
                       ui::MenuSourceType source_type) WARN_UNUSED_RESULT;
 
   // Returns true if we're in a nested message loop running the menu.
   bool IsRunning() const;
 
   // Hides and cancels the menu. This does nothing if the menu is not open.
   void Cancel();
 
   // Returns the time from the event which closed the menu - or 0.
   base::TimeDelta closing_event_time() const;
 
  private:
   friend class test::MenuRunnerTestAPI;
 
   // Sets an implementation of RunMenuAt. This is intended to be used at test.
   void SetRunnerHandler(scoped_ptr<MenuRunnerHandler> runner_handler);
 
-  const int32 run_types_;
+  const int32_t run_types_;
 
   // We own this. No scoped_ptr because it is destroyed by calling Release().
   internal::MenuRunnerImplInterface* impl_;
 
   // An implementation of RunMenuAt. This is usually NULL and ignored. If this
   // is not NULL, this implementation will be used.
   scoped_ptr<MenuRunnerHandler> runner_handler_;
 
   scoped_ptr<internal::DisplayChangeListener> display_change_listener_;
 
@@ skipping 16 matching lines @@
 
  protected:
   DisplayChangeListener() {}
 };
 
 }  // namespace internal
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_