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

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

Issue 2189063002: [arc-intents] Properly qualify API-generated page transitions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix new occurance of an OpenUrl call. Created 4 years, 4 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 <memory> 8 #include <memory>
9 9
10 #include "ash/common/shell_delegate.h" 10 #include "ash/common/shell_delegate.h"
(...skipping 19 matching lines...) Expand all
30 bool IsFirstRunAfterBoot() const override; 30 bool IsFirstRunAfterBoot() const override;
31 bool IsIncognitoAllowed() const override; 31 bool IsIncognitoAllowed() const override;
32 bool IsMultiProfilesEnabled() const override; 32 bool IsMultiProfilesEnabled() const override;
33 bool IsRunningInForcedAppMode() const override; 33 bool IsRunningInForcedAppMode() const override;
34 bool CanShowWindowForUser(WmWindow* window) const override; 34 bool CanShowWindowForUser(WmWindow* window) const override;
35 bool IsForceMaximizeOnFirstRun() const override; 35 bool IsForceMaximizeOnFirstRun() const override;
36 void PreInit() override; 36 void PreInit() override;
37 void PreShutdown() override; 37 void PreShutdown() override;
38 void Exit() override; 38 void Exit() override;
39 keyboard::KeyboardUI* CreateKeyboardUI() override; 39 keyboard::KeyboardUI* CreateKeyboardUI() override;
40 void OpenUrl(const GURL& url) override; 40 void OpenUrlFromArc(const GURL& url) override;
41 app_list::AppListPresenter* GetAppListPresenter() override; 41 app_list::AppListPresenter* GetAppListPresenter() override;
42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
43 SystemTrayDelegate* CreateSystemTrayDelegate() override; 43 SystemTrayDelegate* CreateSystemTrayDelegate() override;
44 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 44 UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
45 SessionStateDelegate* CreateSessionStateDelegate() override; 45 SessionStateDelegate* CreateSessionStateDelegate() override;
46 AccessibilityDelegate* CreateAccessibilityDelegate() override; 46 AccessibilityDelegate* CreateAccessibilityDelegate() override;
47 NewWindowDelegate* CreateNewWindowDelegate() override; 47 NewWindowDelegate* CreateNewWindowDelegate() override;
48 MediaDelegate* CreateMediaDelegate() override; 48 MediaDelegate* CreateMediaDelegate() override;
49 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() 49 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
50 override; 50 override;
51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
52 const ShelfItem* item) override; 52 const ShelfItem* item) override;
53 GPUSupport* CreateGPUSupport() override; 53 GPUSupport* CreateGPUSupport() override;
54 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
55 gfx::Image GetDeprecatedAcceleratorImage() const override; 55 gfx::Image GetDeprecatedAcceleratorImage() const override;
56 56
57 private: 57 private:
58 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; 58 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
59 shell::Connector* connector_; 59 shell::Connector* connector_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698