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

Side by Side Diff: ui/views/examples/menu_example.cc

Issue 10824016: views/examples: Pure pedantic change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « ui/views/examples/double_split_view_example.cc ('k') | ui/views/examples/slider_example.h » ('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) 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/examples/menu_example.h" 5 #include "ui/views/examples/menu_example.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/models/simple_menu_model.h" 10 #include "ui/base/models/simple_menu_model.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 ExampleMenuButton::~ExampleMenuButton() { 184 ExampleMenuButton::~ExampleMenuButton() {
185 } 185 }
186 186
187 void ExampleMenuButton::OnMenuButtonClicked(View* source, 187 void ExampleMenuButton::OnMenuButtonClicked(View* source,
188 const gfx::Point& point) { 188 const gfx::Point& point) {
189 MenuModelAdapter menu_model_adapter(GetMenuModel()); 189 MenuModelAdapter menu_model_adapter(GetMenuModel());
190 menu_runner_.reset(new MenuRunner(menu_model_adapter.CreateMenu())); 190 menu_runner_.reset(new MenuRunner(menu_model_adapter.CreateMenu()));
191 191
192 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(), this, 192 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(), this,
193 gfx::Rect(point, gfx::Size()), views::MenuItemView::TOPRIGHT, 193 gfx::Rect(point, gfx::Size()), MenuItemView::TOPRIGHT,
194 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) 194 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
195 return; 195 return;
196 } 196 }
197 197
198 ui::SimpleMenuModel* ExampleMenuButton::GetMenuModel() { 198 ui::SimpleMenuModel* ExampleMenuButton::GetMenuModel() {
199 if (!menu_model_.get()) 199 if (!menu_model_.get())
200 menu_model_.reset(new ExampleMenuModel); 200 menu_model_.reset(new ExampleMenuModel);
201 return menu_model_.get(); 201 return menu_model_.get();
202 } 202 }
203 203
204 } // namespace 204 } // namespace
205 205
206 MenuExample::MenuExample() : ExampleBase("Menu") { 206 MenuExample::MenuExample() : ExampleBase("Menu") {
207 } 207 }
208 208
209 MenuExample::~MenuExample() { 209 MenuExample::~MenuExample() {
210 } 210 }
211 211
212 void MenuExample::CreateExampleView(View* container) { 212 void MenuExample::CreateExampleView(View* container) {
213 // We add a button to open a menu. 213 // We add a button to open a menu.
214 ExampleMenuButton* menu_button = new ExampleMenuButton( 214 ExampleMenuButton* menu_button = new ExampleMenuButton(
215 ASCIIToUTF16("Open a menu")); 215 ASCIIToUTF16("Open a menu"));
216 container->SetLayoutManager(new FillLayout); 216 container->SetLayoutManager(new FillLayout);
217 container->AddChildView(menu_button); 217 container->AddChildView(menu_button);
218 } 218 }
219 219
220 } // namespace examples 220 } // namespace examples
221 } // namespace views 221 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/double_split_view_example.cc ('k') | ui/views/examples/slider_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698