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

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

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. 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
« no previous file with comments | « ash/shell_delegate.h ('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 <string> 8 #include <string>
9 9
10 #include "ash/media_delegate.h" 10 #include "ash/media_delegate.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void RemoveVirtualKeyboardStateObserver( 48 void RemoveVirtualKeyboardStateObserver(
49 VirtualKeyboardStateObserver* observer) override; 49 VirtualKeyboardStateObserver* observer) override;
50 app_list::AppListViewDelegate* GetAppListViewDelegate() override; 50 app_list::AppListViewDelegate* GetAppListViewDelegate() override;
51 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 51 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
52 SystemTrayDelegate* CreateSystemTrayDelegate() override; 52 SystemTrayDelegate* CreateSystemTrayDelegate() override;
53 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; 53 UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
54 TestSessionStateDelegate* CreateSessionStateDelegate() override; 54 TestSessionStateDelegate* CreateSessionStateDelegate() override;
55 AccessibilityDelegate* CreateAccessibilityDelegate() override; 55 AccessibilityDelegate* CreateAccessibilityDelegate() override;
56 NewWindowDelegate* CreateNewWindowDelegate() override; 56 NewWindowDelegate* CreateNewWindowDelegate() override;
57 MediaDelegate* CreateMediaDelegate() override; 57 MediaDelegate* CreateMediaDelegate() override;
58 ui::MenuModel* CreateContextMenu(aura::Window* root_window, 58 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
59 const ash::ShelfItem* item) override; 59 const ash::ShelfItem* item) override;
60 GPUSupport* CreateGPUSupport() override; 60 GPUSupport* CreateGPUSupport() override;
61 base::string16 GetProductName() const override; 61 base::string16 GetProductName() const override;
62 gfx::Image GetDeprecatedAcceleratorImage() const override; 62 gfx::Image GetDeprecatedAcceleratorImage() const override;
63 63
64 int num_exit_requests() const { return num_exit_requests_; } 64 int num_exit_requests() const { return num_exit_requests_; }
65 65
66 void SetMediaCaptureState(MediaCaptureState state); 66 void SetMediaCaptureState(MediaCaptureState state);
67 void SetForceMaximizeOnFirstRun(bool maximize) { 67 void SetForceMaximizeOnFirstRun(bool maximize) {
68 force_maximize_on_first_run_ = maximize; 68 force_maximize_on_first_run_ = maximize;
69 } 69 }
70 70
71 private: 71 private:
72 int num_exit_requests_; 72 int num_exit_requests_;
73 bool multi_profiles_enabled_; 73 bool multi_profiles_enabled_;
74 bool force_maximize_on_first_run_; 74 bool force_maximize_on_first_run_;
75 75
76 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 76 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
77 77
78 base::ObserverList<ash::VirtualKeyboardStateObserver> 78 base::ObserverList<ash::VirtualKeyboardStateObserver>
79 keyboard_state_observer_list_; 79 keyboard_state_observer_list_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 81 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
82 }; 82 };
83 83
84 } // namespace test 84 } // namespace test
85 } // namespace ash 85 } // namespace ash
86 86
87 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 87 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698