Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Side by Side Diff: ui/views/controls/menu/menu_runner.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/menu/menu_runner.h" 5 #include "ui/views/controls/menu/menu_runner.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ui/views/controls/menu/menu_runner_handler.h" 9 #include "ui/views/controls/menu/menu_runner_handler.h"
10 #include "ui/views/controls/menu/menu_runner_impl.h" 10 #include "ui/views/controls/menu/menu_runner_impl.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32 run_types) 14 MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32_t run_types)
15 : run_types_(run_types), 15 : run_types_(run_types),
16 impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) { 16 impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) {}
17 }
18 17
19 MenuRunner::MenuRunner(MenuItemView* menu_view, int32 run_types) 18 MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types)
20 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) { 19 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {}
21 }
22 20
23 MenuRunner::~MenuRunner() { 21 MenuRunner::~MenuRunner() {
24 impl_->Release(); 22 impl_->Release();
25 } 23 }
26 24
27 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent, 25 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
28 MenuButton* button, 26 MenuButton* button,
29 const gfx::Rect& bounds, 27 const gfx::Rect& bounds,
30 MenuAnchorPosition anchor, 28 MenuAnchorPosition anchor,
31 ui::MenuSourceType source_type) { 29 ui::MenuSourceType source_type) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 base::TimeDelta MenuRunner::closing_event_time() const { 70 base::TimeDelta MenuRunner::closing_event_time() const {
73 return impl_->GetClosingEventTime(); 71 return impl_->GetClosingEventTime();
74 } 72 }
75 73
76 void MenuRunner::SetRunnerHandler( 74 void MenuRunner::SetRunnerHandler(
77 scoped_ptr<MenuRunnerHandler> runner_handler) { 75 scoped_ptr<MenuRunnerHandler> runner_handler) {
78 runner_handler_ = std::move(runner_handler); 76 runner_handler_ = std::move(runner_handler);
79 } 77 }
80 78
81 } // namespace views 79 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698