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

Side by Side Diff: views/controls/menu/menu_2.cc

Issue 122027: Remove the Menu object, converting all the remaining callers to use Menu2. I'... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « views/controls/menu/menu_2.h ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "views/controls/menu/menu_2.h" 5 #include "views/controls/menu/menu_2.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "views/controls/menu/menu_wrapper.h" 8 #include "views/controls/menu/menu_wrapper.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 gfx::NativeMenu Menu2::GetNativeMenu() const { 45 gfx::NativeMenu Menu2::GetNativeMenu() const {
46 return wrapper_->GetNativeMenu(); 46 return wrapper_->GetNativeMenu();
47 } 47 }
48 48
49 void Menu2::RunMenuAt(const gfx::Point& point, Alignment alignment) { 49 void Menu2::RunMenuAt(const gfx::Point& point, Alignment alignment) {
50 wrapper_->RunMenuAt(point, alignment); 50 wrapper_->RunMenuAt(point, alignment);
51 } 51 }
52 52
53 void Menu2::RunContextMenuAt(const gfx::Point& point) {
54 wrapper_->RunMenuAt(point, ALIGN_TOPLEFT);
55 }
56
53 void Menu2::CancelMenu() { 57 void Menu2::CancelMenu() {
54 wrapper_->CancelMenu(); 58 wrapper_->CancelMenu();
55 } 59 }
56 60
57 void Menu2::Rebuild() { 61 void Menu2::Rebuild() {
58 wrapper_->Rebuild(); 62 wrapper_->Rebuild();
59 } 63 }
60 64
61 void Menu2::UpdateStates() { 65 void Menu2::UpdateStates() {
62 wrapper_->UpdateStates(); 66 wrapper_->UpdateStates();
63 } 67 }
64 68
65 } // namespace 69 } // namespace
OLDNEW
« no previous file with comments | « views/controls/menu/menu_2.h ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698