OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ash/shell/window_type_launcher.h" | 5 #include "ash/shell/window_type_launcher.h" |
6 | 6 |
7 #include "ash/shell/example_factory.h" | 7 #include "ash/shell/example_factory.h" |
8 #include "ash/shell/toplevel_window.h" | 8 #include "ash/shell/toplevel_window.h" |
9 #include "ash/wm/shadow_types.h" | 9 #include "ash/wm/shadow_types.h" |
| 10 #include "ash/wm/toplevel_frame_view.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "ui/aura/root_window.h" | 12 #include "ui/aura/root_window.h" |
12 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
13 #include "ui/aura_shell/shell_window_ids.h" | 14 #include "ui/aura_shell/shell_window_ids.h" |
14 #include "ui/aura_shell/toplevel_frame_view.h" | |
15 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
16 #include "ui/gfx/compositor/layer.h" | 16 #include "ui/gfx/compositor/layer.h" |
17 #include "ui/views/controls/button/text_button.h" | 17 #include "ui/views/controls/button/text_button.h" |
18 #include "ui/views/controls/menu/menu_item_view.h" | 18 #include "ui/views/controls/menu/menu_item_view.h" |
19 #include "ui/views/controls/menu/menu_runner.h" | 19 #include "ui/views/controls/menu/menu_runner.h" |
20 #include "ui/views/examples/examples_window.h" | 20 #include "ui/views/examples/examples_window.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 | 22 |
23 using views::MenuItemView; | 23 using views::MenuItemView; |
24 using views::MenuRunner; | 24 using views::MenuRunner; |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 // MenuRunner takes ownership of root. | 309 // MenuRunner takes ownership of root. |
310 menu_runner_.reset(new MenuRunner(root)); | 310 menu_runner_.reset(new MenuRunner(root)); |
311 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(p, gfx::Size(0, 0)), | 311 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(p, gfx::Size(0, 0)), |
312 MenuItemView::TOPLEFT, | 312 MenuItemView::TOPLEFT, |
313 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) | 313 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) |
314 return; | 314 return; |
315 } | 315 } |
316 | 316 |
317 } // namespace shell | 317 } // namespace shell |
318 } // namespace ash | 318 } // namespace ash |
OLD | NEW |