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

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 1 month 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/test/ash_test_helper.cc ('k') | ash/test/test_shell_delegate.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 (c) 2012 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_TEST_TEST_SHELL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 void PreShutdown() override; 45 void PreShutdown() override;
46 void Exit() override; 46 void Exit() override;
47 keyboard::KeyboardUI* CreateKeyboardUI() override; 47 keyboard::KeyboardUI* CreateKeyboardUI() override;
48 void OpenUrlFromArc(const GURL& url) override; 48 void OpenUrlFromArc(const GURL& url) override;
49 app_list::AppListPresenter* GetAppListPresenter() override; 49 app_list::AppListPresenter* GetAppListPresenter() override;
50 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 50 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
51 SystemTrayDelegate* CreateSystemTrayDelegate() override; 51 SystemTrayDelegate* CreateSystemTrayDelegate() override;
52 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 52 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
53 TestSessionStateDelegate* CreateSessionStateDelegate() override; 53 TestSessionStateDelegate* CreateSessionStateDelegate() override;
54 AccessibilityDelegate* CreateAccessibilityDelegate() override; 54 AccessibilityDelegate* CreateAccessibilityDelegate() override;
55 NewWindowDelegate* CreateNewWindowDelegate() override;
56 MediaDelegate* CreateMediaDelegate() override; 55 MediaDelegate* CreateMediaDelegate() override;
57 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 56 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
58 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 57 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
59 const ShelfItem* item) override; 58 const ShelfItem* item) override;
60 GPUSupport* CreateGPUSupport() override; 59 GPUSupport* CreateGPUSupport() override;
61 base::string16 GetProductName() const override; 60 base::string16 GetProductName() const override;
62 gfx::Image GetDeprecatedAcceleratorImage() const override; 61 gfx::Image GetDeprecatedAcceleratorImage() const override;
63 62
64 int num_exit_requests() const { return num_exit_requests_; } 63 int num_exit_requests() const { return num_exit_requests_; }
65 64
(...skipping 15 matching lines...) Expand all
81 app_list_presenter_delegate_factory_; 80 app_list_presenter_delegate_factory_;
82 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; 81 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
83 82
84 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
85 }; 84 };
86 85
87 } // namespace test 86 } // namespace test
88 } // namespace ash 87 } // namespace ash
89 88
90 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 89 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698