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

Side by Side Diff: ash/shell.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: Restructure based on feedback 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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 #endif 595 #endif
596 596
597 // Needs to happen right before |instance_| is reset. 597 // Needs to happen right before |instance_| is reset.
598 wm_shell_.reset(); 598 wm_shell_.reset();
599 599
600 DCHECK(instance_ == this); 600 DCHECK(instance_ == this);
601 instance_ = nullptr; 601 instance_ = nullptr;
602 } 602 }
603 603
604 void Shell::Init(const ShellInitParams& init_params) { 604 void Shell::Init(const ShellInitParams& init_params) {
605 wm_shell_->Initialize(init_params.blocking_pool); 605 wm_shell_->Initialize(init_params.blocking_pool, init_params.connector);
606 606
607 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); 607 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
608 608
609 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 609 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
610 NOTREACHED() << "linux desktop does not support ash."; 610 NOTREACHED() << "linux desktop does not support ash.";
611 #endif 611 #endif
612 612
613 scoped_overview_animation_settings_factory_.reset( 613 scoped_overview_animation_settings_factory_.reset(
614 new ScopedOverviewAnimationSettingsFactoryAura); 614 new ScopedOverviewAnimationSettingsFactoryAura);
615 window_positioner_.reset(new WindowPositioner(wm_shell_.get())); 615 window_positioner_.reset(new WindowPositioner(wm_shell_.get()));
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 923 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
924 return std::unique_ptr<ui::EventTargetIterator>(); 924 return std::unique_ptr<ui::EventTargetIterator>();
925 } 925 }
926 926
927 ui::EventTargeter* Shell::GetEventTargeter() { 927 ui::EventTargeter* Shell::GetEventTargeter() {
928 NOTREACHED(); 928 NOTREACHED();
929 return nullptr; 929 return nullptr;
930 } 930 }
931 931
932 } // namespace ash 932 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698