| OLD | NEW |
| 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 "ash/shell/window_type_launcher.h" | 5 #include "ash/shell/window_type_launcher.h" |
| 6 | 6 |
| 7 #include "ash/screensaver/screensaver_view.h" | 7 #include "ash/screensaver/screensaver_view.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell/example_factory.h" | 9 #include "ash/shell/example_factory.h" |
| 10 #include "ash/shell/panel_window.h" | 10 #include "ash/shell/panel_window.h" |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 root->AppendMenuItem(COMMAND_NEW_WINDOW, | 366 root->AppendMenuItem(COMMAND_NEW_WINDOW, |
| 367 ASCIIToUTF16("New Window"), | 367 ASCIIToUTF16("New Window"), |
| 368 MenuItemView::NORMAL); | 368 MenuItemView::NORMAL); |
| 369 root->AppendMenuItem(COMMAND_TOGGLE_FULLSCREEN, | 369 root->AppendMenuItem(COMMAND_TOGGLE_FULLSCREEN, |
| 370 ASCIIToUTF16("Toggle FullScreen"), | 370 ASCIIToUTF16("Toggle FullScreen"), |
| 371 MenuItemView::NORMAL); | 371 MenuItemView::NORMAL); |
| 372 // MenuRunner takes ownership of root. | 372 // MenuRunner takes ownership of root. |
| 373 menu_runner_.reset(new MenuRunner(root)); | 373 menu_runner_.reset(new MenuRunner(root)); |
| 374 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), | 374 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), |
| 375 MenuItemView::TOPLEFT, | 375 MenuItemView::TOPLEFT, |
| 376 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) | 376 MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == |
| 377 MenuRunner::MENU_DELETED) |
| 377 return; | 378 return; |
| 378 } | 379 } |
| 379 #endif // !defined(OS_MACOSX) | 380 #endif // !defined(OS_MACOSX) |
| 380 | 381 |
| 381 } // namespace shell | 382 } // namespace shell |
| 382 } // namespace ash | 383 } // namespace ash |
| OLD | NEW |