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

Side by Side Diff: ash/shell.cc

Issue 2257763002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/mus/root_window_controller.cc ('k') | ash/shell/shell_delegate_impl.cc » ('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.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 // process, so we won't try to configure displays here. 732 // process, so we won't try to configure displays here.
733 if (in_mus_) { 733 if (in_mus_) {
734 display_configurator_->set_configure_display(false); 734 display_configurator_->set_configure_display(false);
735 } else { 735 } else {
736 #if defined(USE_OZONE) 736 #if defined(USE_OZONE)
737 display_configurator_->Init( 737 display_configurator_->Init(
738 ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(), 738 ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(),
739 !gpu_support_->IsPanelFittingDisabled()); 739 !gpu_support_->IsPanelFittingDisabled());
740 #elif defined(USE_X11) 740 #elif defined(USE_X11)
741 display_configurator_->Init( 741 display_configurator_->Init(
742 base::WrapUnique(new ui::NativeDisplayDelegateX11()), 742 base::MakeUnique<ui::NativeDisplayDelegateX11>(),
743 !gpu_support_->IsPanelFittingDisabled()); 743 !gpu_support_->IsPanelFittingDisabled());
744 #endif 744 #endif
745 } 745 }
746 746
747 // The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell. 747 // The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell.
748 chromeos::DBusThreadManager* dbus_thread_manager = 748 chromeos::DBusThreadManager* dbus_thread_manager =
749 chromeos::DBusThreadManager::Get(); 749 chromeos::DBusThreadManager::Get();
750 projecting_observer_.reset( 750 projecting_observer_.reset(
751 new ProjectingObserver(dbus_thread_manager->GetPowerManagerClient())); 751 new ProjectingObserver(dbus_thread_manager->GetPowerManagerClient()));
752 display_configurator_->AddObserver(projecting_observer_.get()); 752 display_configurator_->AddObserver(projecting_observer_.get());
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 1039 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
1040 return std::unique_ptr<ui::EventTargetIterator>(); 1040 return std::unique_ptr<ui::EventTargetIterator>();
1041 } 1041 }
1042 1042
1043 ui::EventTargeter* Shell::GetEventTargeter() { 1043 ui::EventTargeter* Shell::GetEventTargeter() {
1044 NOTREACHED(); 1044 NOTREACHED();
1045 return nullptr; 1045 return nullptr;
1046 } 1046 }
1047 1047
1048 } // namespace ash 1048 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/root_window_controller.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698