| 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 ash::Shell::GetInstance()->status_area_widget()-> | 330 ash::Shell::GetInstance()->status_area_widget()-> |
| 331 web_notification_tray()->AddNotification( | 331 web_notification_tray()->AddNotification( |
| 332 "id0", | 332 "id0", |
| 333 ASCIIToUTF16("Test Shell Web Notification"), | 333 ASCIIToUTF16("Test Shell Web Notification"), |
| 334 ASCIIToUTF16("Notification message body."), | 334 ASCIIToUTF16("Notification message body."), |
| 335 ASCIIToUTF16("www.testshell.org"), | 335 ASCIIToUTF16("www.testshell.org"), |
| 336 "" /* extension id */); | 336 "" /* extension id */); |
| 337 } | 337 } |
| 338 #if !defined(OS_MACOSX) | 338 #if !defined(OS_MACOSX) |
| 339 else if (sender == examples_button_) { | 339 else if (sender == examples_button_) { |
| 340 views::examples::ShowExamplesWindow( | 340 views::examples::ShowExamplesWindowWithContent( |
| 341 views::examples::DO_NOTHING_ON_CLOSE, | 341 views::examples::DO_NOTHING_ON_CLOSE, |
| 342 ash::Shell::GetInstance()->browser_context()); | 342 ash::Shell::GetInstance()->browser_context()); |
| 343 } | 343 } |
| 344 #endif // !defined(OS_MACOSX) | 344 #endif // !defined(OS_MACOSX) |
| 345 } | 345 } |
| 346 | 346 |
| 347 #if !defined(OS_MACOSX) | 347 #if !defined(OS_MACOSX) |
| 348 void WindowTypeLauncher::ExecuteCommand(int id) { | 348 void WindowTypeLauncher::ExecuteCommand(int id) { |
| 349 switch (id) { | 349 switch (id) { |
| 350 case COMMAND_NEW_WINDOW: | 350 case COMMAND_NEW_WINDOW: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 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) == MenuRunner::MENU_DELETED) |
| 377 return; | 377 return; |
| 378 } | 378 } |
| 379 #endif // !defined(OS_MACOSX) | 379 #endif // !defined(OS_MACOSX) |
| 380 | 380 |
| 381 } // namespace shell | 381 } // namespace shell |
| 382 } // namespace ash | 382 } // namespace ash |
| OLD | NEW |