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

Side by Side Diff: ash/system/chromeos/tray_display.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: 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
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/system/chromeos/tray_display.h" 5 #include "ash/system/chromeos/tray_display.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
oshima 2016/04/08 07:09:41 include?
9 9
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/display/screen_orientation_controller_chromeos.h" 11 #include "ash/display/screen_orientation_controller_chromeos.h"
12 #include "ash/display/window_tree_host_manager.h" 12 #include "ash/display/window_tree_host_manager.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/system/chromeos/devicetype_utils.h" 14 #include "ash/system/chromeos/devicetype_utils.h"
15 #include "ash/system/system_notifier.h" 15 #include "ash/system/system_notifier.h"
16 #include "ash/system/tray/actionable_view.h" 16 #include "ash/system/tray/actionable_view.h"
17 #include "ash/system/tray/fixed_sized_image_view.h" 17 #include "ash/system/tray/fixed_sized_image_view.h"
18 #include "ash/system/tray/system_tray.h" 18 #include "ash/system/tray/system_tray.h"
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 // Don't display notifications for accelerometer triggered screen rotations. 391 // Don't display notifications for accelerometer triggered screen rotations.
392 // See http://crbug.com/364949 392 // See http://crbug.com/364949
393 if (Shell::GetInstance() 393 if (Shell::GetInstance()
394 ->screen_orientation_controller() 394 ->screen_orientation_controller()
395 ->ignore_display_configuration_updates()) { 395 ->ignore_display_configuration_updates()) {
396 return; 396 return;
397 } 397 }
398 398
399 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); 399 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
400 scoped_ptr<Notification> notification(new Notification( 400 std::unique_ptr<Notification> notification(new Notification(
401 message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId, message, 401 message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId, message,
402 additional_message, bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY), 402 additional_message, bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
403 base::string16(), // display_source 403 base::string16(), // display_source
404 GURL(), 404 GURL(),
405 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT, 405 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
406 system_notifier::kNotifierDisplay), 406 system_notifier::kNotifierDisplay),
407 message_center::RichNotificationData(), 407 message_center::RichNotificationData(),
408 new message_center::HandleNotificationClickedDelegate( 408 new message_center::HandleNotificationClickedDelegate(
409 base::Bind(&OpenSettings)))); 409 base::Bind(&OpenSettings))));
410 410
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { 450 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
451 views::View* view = default_; 451 views::View* view = default_;
452 if (view) { 452 if (view) {
453 view->GetAccessibleState(state); 453 view->GetAccessibleState(state);
454 return true; 454 return true;
455 } 455 }
456 return false; 456 return false;
457 } 457 }
458 458
459 } // namespace ash 459 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698