| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/screensaver/screensaver_view.h" | 8 #include "ash/screensaver/screensaver_view.h" |
| 9 #include "ash/session_state_delegate.h" | 9 #include "ash/session_state_delegate.h" |
| 10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.h" |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 | 337 |
| 338 } else if (sender == show_web_notification_) { | 338 } else if (sender == show_web_notification_) { |
| 339 scoped_ptr<message_center::Notification> notification; | 339 scoped_ptr<message_center::Notification> notification; |
| 340 notification.reset(new message_center::Notification( | 340 notification.reset(new message_center::Notification( |
| 341 message_center::NOTIFICATION_TYPE_SIMPLE, | 341 message_center::NOTIFICATION_TYPE_SIMPLE, |
| 342 "id0", | 342 "id0", |
| 343 ASCIIToUTF16("Test Shell Web Notification"), | 343 ASCIIToUTF16("Test Shell Web Notification"), |
| 344 ASCIIToUTF16("Notification message body."), | 344 ASCIIToUTF16("Notification message body."), |
| 345 gfx::Image(), | 345 gfx::Image(), |
| 346 ASCIIToUTF16("www.testshell.org"), | 346 ASCIIToUTF16("www.testshell.org"), |
| 347 message_center::NotifierId(), | 347 message_center::NotifierId( |
| 348 message_center::NotifierId::APPLICATION, "test-id"), |
| 348 message_center::RichNotificationData(), | 349 message_center::RichNotificationData(), |
| 349 NULL /* delegate */)); | 350 NULL /* delegate */)); |
| 350 | 351 |
| 351 ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget() | 352 ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget() |
| 352 ->web_notification_tray()->message_center() | 353 ->web_notification_tray()->message_center() |
| 353 ->AddNotification(notification.Pass()); | 354 ->AddNotification(notification.Pass()); |
| 354 } else if (sender == examples_button_) { | 355 } else if (sender == examples_button_) { |
| 355 views::examples::ShowExamplesWindowWithContent( | 356 views::examples::ShowExamplesWindowWithContent( |
| 356 views::examples::DO_NOTHING_ON_CLOSE, | 357 views::examples::DO_NOTHING_ON_CLOSE, |
| 357 Shell::GetInstance()->delegate()->GetCurrentBrowserContext(), | 358 Shell::GetInstance()->delegate()->GetCurrentBrowserContext(), |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 gfx::Rect(point, gfx::Size()), | 390 gfx::Rect(point, gfx::Size()), |
| 390 MenuItemView::TOPLEFT, | 391 MenuItemView::TOPLEFT, |
| 391 source_type, | 392 source_type, |
| 392 MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == | 393 MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == |
| 393 MenuRunner::MENU_DELETED) | 394 MenuRunner::MENU_DELETED) |
| 394 return; | 395 return; |
| 395 } | 396 } |
| 396 | 397 |
| 397 } // namespace shell | 398 } // namespace shell |
| 398 } // namespace ash | 399 } // namespace ash |
| OLD | NEW |