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

Side by Side Diff: ash/shell/window_type_launcher.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « ash/shell/window_type_launcher.h ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "ash/content/shell_content_state.h" 9 #include "ash/content/shell_content_state.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(), 305 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
306 ui::MODAL_TYPE_WINDOW); 306 ui::MODAL_TYPE_WINDOW);
307 } else if (sender == child_modal_button_) { 307 } else if (sender == child_modal_button_) {
308 ash::test::CreateChildModalParent( 308 ash::test::CreateChildModalParent(
309 GetWidget()->GetNativeView()->GetRootWindow()); 309 GetWidget()->GetNativeView()->GetRootWindow());
310 } else if (sender == transient_button_) { 310 } else if (sender == transient_button_) {
311 NonModalTransient::OpenNonModalTransient(GetWidget()->GetNativeView()); 311 NonModalTransient::OpenNonModalTransient(GetWidget()->GetNativeView());
312 } else if (sender == show_hide_window_button_) { 312 } else if (sender == show_hide_window_button_) {
313 NonModalTransient::ToggleNonModalTransient(GetWidget()->GetNativeView()); 313 NonModalTransient::ToggleNonModalTransient(GetWidget()->GetNativeView());
314 } else if (sender == show_web_notification_) { 314 } else if (sender == show_web_notification_) {
315 scoped_ptr<message_center::Notification> notification; 315 std::unique_ptr<message_center::Notification> notification;
316 notification.reset(new message_center::Notification( 316 notification.reset(new message_center::Notification(
317 message_center::NOTIFICATION_TYPE_SIMPLE, "id0", 317 message_center::NOTIFICATION_TYPE_SIMPLE, "id0",
318 base::ASCIIToUTF16("Test Shell Web Notification"), 318 base::ASCIIToUTF16("Test Shell Web Notification"),
319 base::ASCIIToUTF16("Notification message body."), gfx::Image(), 319 base::ASCIIToUTF16("Notification message body."), gfx::Image(),
320 base::ASCIIToUTF16("www.testshell.org"), GURL(), 320 base::ASCIIToUTF16("www.testshell.org"), GURL(),
321 message_center::NotifierId(message_center::NotifierId::APPLICATION, 321 message_center::NotifierId(message_center::NotifierId::APPLICATION,
322 "test-id"), 322 "test-id"),
323 message_center::RichNotificationData(), NULL /* delegate */)); 323 message_center::RichNotificationData(), NULL /* delegate */));
324 324
325 ash::Shell::GetPrimaryRootWindowController() 325 ash::Shell::GetPrimaryRootWindowController()
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 NULL, 366 NULL,
367 gfx::Rect(point, gfx::Size()), 367 gfx::Rect(point, gfx::Size()),
368 views::MENU_ANCHOR_TOPLEFT, 368 views::MENU_ANCHOR_TOPLEFT,
369 source_type) == MenuRunner::MENU_DELETED) { 369 source_type) == MenuRunner::MENU_DELETED) {
370 return; 370 return;
371 } 371 }
372 } 372 }
373 373
374 } // namespace shell 374 } // namespace shell
375 } // namespace ash 375 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_type_launcher.h ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698