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

Side by Side Diff: ash/shell.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: cleanup Created 4 years, 2 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/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 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 #endif 600 #endif
601 601
602 // Needs to happen right before |instance_| is reset. 602 // Needs to happen right before |instance_| is reset.
603 wm_shell_.reset(); 603 wm_shell_.reset();
604 604
605 DCHECK(instance_ == this); 605 DCHECK(instance_ == this);
606 instance_ = nullptr; 606 instance_ = nullptr;
607 } 607 }
608 608
609 void Shell::Init(const ShellInitParams& init_params) { 609 void Shell::Init(const ShellInitParams& init_params) {
610 wm_shell_->Initialize(init_params.blocking_pool); 610 // HACK: In real life, this would have a shell::Connector as well.
611 wm_shell_->Initialize(init_params.blocking_pool, nullptr);
611 612
612 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); 613 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
613 614
614 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 615 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
615 NOTREACHED() << "linux desktop does not support ash."; 616 NOTREACHED() << "linux desktop does not support ash.";
616 #endif 617 #endif
617 618
618 scoped_overview_animation_settings_factory_.reset( 619 scoped_overview_animation_settings_factory_.reset(
619 new ScopedOverviewAnimationSettingsFactoryAura); 620 new ScopedOverviewAnimationSettingsFactoryAura);
620 window_positioner_.reset(new WindowPositioner(wm_shell_.get())); 621 window_positioner_.reset(new WindowPositioner(wm_shell_.get()));
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 937 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
937 return std::unique_ptr<ui::EventTargetIterator>(); 938 return std::unique_ptr<ui::EventTargetIterator>();
938 } 939 }
939 940
940 ui::EventTargeter* Shell::GetEventTargeter() { 941 ui::EventTargeter* Shell::GetEventTargeter() {
941 NOTREACHED(); 942 NOTREACHED();
942 return nullptr; 943 return nullptr;
943 } 944 }
944 945
945 } // namespace ash 946 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698