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

Unified Diff: ash/shell/window_type_launcher.cc

Issue 23483041: [Cleanup] Remove mac code from aura/ash/views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/shell/window_type_launcher.h ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_type_launcher.cc
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index 949b3aef9b5d76b74bafd6f86e5fc9b4e3388f8c..918d72514b8b3510cee465cba28f3ce472b1b403 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -266,9 +266,7 @@ WindowTypeLauncher::WindowTypeLauncher()
AddViewToLayout(layout, show_hide_window_button_);
AddViewToLayout(layout, show_screensaver_);
AddViewToLayout(layout, show_web_notification_);
-#if !defined(OS_MACOSX)
set_context_menu_controller(this);
-#endif
}
WindowTypeLauncher::~WindowTypeLauncher() {
@@ -352,17 +350,13 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender,
ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget()
->web_notification_tray()->message_center()
->AddNotification(notification.Pass());
- }
-#if !defined(OS_MACOSX)
- else if (sender == examples_button_) {
+ } else if (sender == examples_button_) {
views::examples::ShowExamplesWindowWithContent(
views::examples::DO_NOTHING_ON_CLOSE,
ash::Shell::GetInstance()->browser_context());
}
-#endif // !defined(OS_MACOSX)
}
-#if !defined(OS_MACOSX)
void WindowTypeLauncher::ExecuteCommand(int id, int event_flags) {
switch (id) {
case COMMAND_NEW_WINDOW:
@@ -375,9 +369,7 @@ void WindowTypeLauncher::ExecuteCommand(int id, int event_flags) {
break;
}
}
-#endif // !defined(OS_MACOSX)
-#if !defined(OS_MACOSX)
void WindowTypeLauncher::ShowContextMenuForView(
views::View* source,
const gfx::Point& point,
@@ -399,7 +391,6 @@ void WindowTypeLauncher::ShowContextMenuForView(
MenuRunner::MENU_DELETED)
return;
}
-#endif // !defined(OS_MACOSX)
} // namespace shell
} // namespace ash
« no previous file with comments | « ash/shell/window_type_launcher.h ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698