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

Side by Side Diff: ash/mus/shell_delegate_mus.h

Issue 2908643003: [mus+ash] Removes WmWindow from ash/wm/focus_rules (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/focus_rules (rebased) Created 3 years, 7 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 | « no previous file | ash/mus/shell_delegate_mus.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 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 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace service_manager { 13 namespace service_manager {
14 class Connector; 14 class Connector;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
19 class ShellDelegateMus : public ShellDelegate { 19 class ShellDelegateMus : public ShellDelegate {
20 public: 20 public:
21 explicit ShellDelegateMus(service_manager::Connector* connector); 21 explicit ShellDelegateMus(service_manager::Connector* connector);
22 ~ShellDelegateMus() override; 22 ~ShellDelegateMus() override;
23 23
24 // ShellDelegate: 24 // ShellDelegate:
25 service_manager::Connector* GetShellConnector() const override; 25 service_manager::Connector* GetShellConnector() const override;
26 bool IsIncognitoAllowed() const override; 26 bool IsIncognitoAllowed() const override;
27 bool IsMultiProfilesEnabled() const override; 27 bool IsMultiProfilesEnabled() const override;
28 bool IsRunningInForcedAppMode() const override; 28 bool IsRunningInForcedAppMode() const override;
29 bool CanShowWindowForUser(WmWindow* window) const override; 29 bool CanShowWindowForUser(aura::Window* window) const override;
30 bool IsForceMaximizeOnFirstRun() const override; 30 bool IsForceMaximizeOnFirstRun() const override;
31 void PreInit() override; 31 void PreInit() override;
32 void PreShutdown() override; 32 void PreShutdown() override;
33 void Exit() override; 33 void Exit() override;
34 keyboard::KeyboardUI* CreateKeyboardUI() override; 34 keyboard::KeyboardUI* CreateKeyboardUI() override;
35 void OpenUrlFromArc(const GURL& url) override; 35 void OpenUrlFromArc(const GURL& url) override;
36 void ShelfInit() override; 36 void ShelfInit() override;
37 void ShelfShutdown() override; 37 void ShelfShutdown() override;
38 SystemTrayDelegate* CreateSystemTrayDelegate() override; 38 SystemTrayDelegate* CreateSystemTrayDelegate() override;
39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
(...skipping 14 matching lines...) Expand all
54 private: 54 private:
55 // |connector_| may be null in tests. 55 // |connector_| may be null in tests.
56 service_manager::Connector* connector_; 56 service_manager::Connector* connector_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 58 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
59 }; 59 };
60 60
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698