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

Unified Diff: ash/wm/workspace_controller.cc

Issue 9159048: Fix compile with Aura/Mac ash_shell and workspace controller (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes reverse iterators for compatibility with 10.5 SDK Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index b91cdebed32d5a34f46f899d3a0d0f450e5f3275..6b2a3fc2b305bd415bbd61e52042a4073844d0a7 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -53,6 +53,7 @@ void WorkspaceController::ToggleOverview() {
void WorkspaceController::ShowMenu(views::Widget* widget,
const gfx::Point& location) {
+#if !defined(OS_MACOSX)
ui::SimpleMenuModel menu_model(this);
// This is just for testing and will be ripped out before we ship, so none of
// the strings are localized.
@@ -67,6 +68,7 @@ void WorkspaceController::ShowMenu(views::Widget* widget,
views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
views::MenuRunner::MENU_DELETED)
return;
+#endif // !defined(OS_MACOSX)
}
void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) {
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698