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

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

Issue 1760743002: Add simple mash context menu support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; use test items; cleanup. Created 4 years, 9 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 #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 <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 mojo {
19 class Connector;
20 }
21
18 namespace ash { 22 namespace ash {
19 namespace sysui { 23 namespace sysui {
20 24
21 class ShellDelegateMus : public ash::ShellDelegate { 25 class ShellDelegateMus : public ash::ShellDelegate {
22 public: 26 public:
23 ShellDelegateMus(); 27 explicit ShellDelegateMus(mojo::Connector* connector);
24 ~ShellDelegateMus() override; 28 ~ShellDelegateMus() override;
25 29
26 bool IsFirstRunAfterBoot() const override; 30 bool IsFirstRunAfterBoot() const override;
27 bool IsIncognitoAllowed() const override; 31 bool IsIncognitoAllowed() const override;
28 bool IsMultiProfilesEnabled() const override; 32 bool IsMultiProfilesEnabled() const override;
29 bool IsRunningInForcedAppMode() const override; 33 bool IsRunningInForcedAppMode() const override;
30 bool CanShowWindowForUser(aura::Window* window) const override; 34 bool CanShowWindowForUser(aura::Window* window) const override;
31 bool IsForceMaximizeOnFirstRun() const override; 35 bool IsForceMaximizeOnFirstRun() const override;
32 void PreInit() override; 36 void PreInit() override;
33 void PreShutdown() override; 37 void PreShutdown() override;
(...skipping 12 matching lines...) Expand all
46 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; 50 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
47 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 51 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
48 ash::MediaDelegate* CreateMediaDelegate() override; 52 ash::MediaDelegate* CreateMediaDelegate() override;
49 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, 53 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
50 const ash::ShelfItem* item) override; 54 const ash::ShelfItem* item) override;
51 GPUSupport* CreateGPUSupport() override; 55 GPUSupport* CreateGPUSupport() override;
52 base::string16 GetProductName() const override; 56 base::string16 GetProductName() const override;
53 gfx::Image GetDeprecatedAcceleratorImage() const override; 57 gfx::Image GetDeprecatedAcceleratorImage() const override;
54 58
55 private: 59 private:
60 mojo::Connector* connector_;
61
56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
57 }; 63 };
58 64
59 } // namespace sysui 65 } // namespace sysui
60 } // namespace ash 66 } // namespace ash
61 67
62 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 68 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698