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

Side by Side Diff: ash/mus/bridge/shell_port_mash.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash (cleaning remaining wm_window.h in c/b/ui) Created 3 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/bridge/shell_port_mash.h" 5 #include "ash/mus/bridge/shell_port_mash.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // TODO(jamescook): After ShellDelegate is ported to ash/common use 81 // TODO(jamescook): After ShellDelegate is ported to ash/common use
82 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version 82 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version
83 // of SessionStateDelegate. 83 // of SessionStateDelegate.
84 class SessionStateDelegateStub : public SessionStateDelegate { 84 class SessionStateDelegateStub : public SessionStateDelegate {
85 public: 85 public:
86 SessionStateDelegateStub() : user_info_(new user_manager::UserInfoImpl()) {} 86 SessionStateDelegateStub() : user_info_(new user_manager::UserInfoImpl()) {}
87 87
88 ~SessionStateDelegateStub() override {} 88 ~SessionStateDelegateStub() override {}
89 89
90 // SessionStateDelegate: 90 // SessionStateDelegate:
91 bool ShouldShowAvatar(WmWindow* window) const override { 91 bool ShouldShowAvatar(aura::Window* window) const override {
92 NOTIMPLEMENTED(); 92 NOTIMPLEMENTED();
93 return !user_info_->GetImage().isNull(); 93 return !user_info_->GetImage().isNull();
94 } 94 }
95 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { 95 gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override {
96 NOTIMPLEMENTED(); 96 NOTIMPLEMENTED();
97 return gfx::ImageSkia(); 97 return gfx::ImageSkia();
98 } 98 }
99 99
100 private: 100 private:
101 // A pseudo user info. 101 // A pseudo user info.
102 std::unique_ptr<user_manager::UserInfo> user_info_; 102 std::unique_ptr<user_manager::UserInfo> user_info_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub); 104 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
105 }; 105 };
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 observer.OnDisplayConfigurationChanging(); 637 observer.OnDisplayConfigurationChanging();
638 } 638 }
639 639
640 void ShellPortMash::OnDisplayConfigurationChanged() { 640 void ShellPortMash::OnDisplayConfigurationChanged() {
641 for (auto& observer : display_observers_) 641 for (auto& observer : display_observers_)
642 observer.OnDisplayConfigurationChanged(); 642 observer.OnDisplayConfigurationChanged();
643 } 643 }
644 644
645 } // namespace mus 645 } // namespace mus
646 } // namespace ash 646 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698