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/mus/shell_delegate_mus.h

Issue 1676713002: ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix-cros-build Created 4 years, 10 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/main.cc ('k') | 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 (c) 2012 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_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace keyboard { 14 namespace keyboard {
15 class KeyboardUI; 15 class KeyboardUI;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 namespace shell { 19 namespace sysui {
20 20
21 class ShelfDelegateImpl; 21 class ShellDelegateMus : public ash::ShellDelegate {
22
23 class ShellDelegateImpl : public ash::ShellDelegate {
24 public: 22 public:
25 ShellDelegateImpl(); 23 ShellDelegateMus();
26 ~ShellDelegateImpl() override; 24 ~ShellDelegateMus() override;
27 25
28 bool IsFirstRunAfterBoot() const override; 26 bool IsFirstRunAfterBoot() const override;
29 bool IsIncognitoAllowed() const override; 27 bool IsIncognitoAllowed() const override;
30 bool IsMultiProfilesEnabled() const override; 28 bool IsMultiProfilesEnabled() const override;
31 bool IsRunningInForcedAppMode() const override; 29 bool IsRunningInForcedAppMode() const override;
32 bool CanShowWindowForUser(aura::Window* window) const override; 30 bool CanShowWindowForUser(aura::Window* window) const override;
33 bool IsForceMaximizeOnFirstRun() const override; 31 bool IsForceMaximizeOnFirstRun() const override;
34 void PreInit() override; 32 void PreInit() override;
35 void PreShutdown() override; 33 void PreShutdown() override;
36 void Exit() override; 34 void Exit() override;
(...skipping 12 matching lines...) Expand all
49 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 47 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
50 ash::MediaDelegate* CreateMediaDelegate() override; 48 ash::MediaDelegate* CreateMediaDelegate() override;
51 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 49 ui::MenuModel* CreateContextMenu(aura::Window* root_window,
52 ash::ShelfItemDelegate* item_delegate, 50 ash::ShelfItemDelegate* item_delegate,
53 ash::ShelfItem* item) override; 51 ash::ShelfItem* item) override;
54 GPUSupport* CreateGPUSupport() override; 52 GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 53 base::string16 GetProductName() const override;
56 gfx::Image GetDeprecatedAcceleratorImage() const override; 54 gfx::Image GetDeprecatedAcceleratorImage() const override;
57 55
58 private: 56 private:
59 ShelfDelegateImpl* shelf_delegate_; 57 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
60 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
61
62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
63 }; 58 };
64 59
65 } // namespace shell 60 } // namespace sysui
66 } // namespace ash 61 } // namespace ash
67 62
68 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/main.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698