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

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

Issue 2908643003: [mus+ash] Removes WmWindow from ash/wm/focus_rules (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/focus_rules (rebased) Created 3 years, 7 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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 34
35 void set_active_user_pref_service(PrefService* pref_service) { 35 void set_active_user_pref_service(PrefService* pref_service) {
36 active_user_pref_service_ = pref_service; 36 active_user_pref_service_ = pref_service;
37 } 37 }
38 38
39 // Overridden from ShellDelegate: 39 // Overridden from ShellDelegate:
40 ::service_manager::Connector* GetShellConnector() const override; 40 ::service_manager::Connector* GetShellConnector() const override;
41 bool IsIncognitoAllowed() const override; 41 bool IsIncognitoAllowed() const override;
42 bool IsMultiProfilesEnabled() const override; 42 bool IsMultiProfilesEnabled() const override;
43 bool IsRunningInForcedAppMode() const override; 43 bool IsRunningInForcedAppMode() const override;
44 bool CanShowWindowForUser(WmWindow* window) const override; 44 bool CanShowWindowForUser(aura::Window* window) const override;
45 bool IsForceMaximizeOnFirstRun() const override; 45 bool IsForceMaximizeOnFirstRun() const override;
46 void PreInit() override; 46 void PreInit() override;
47 void PreShutdown() override; 47 void PreShutdown() override;
48 void Exit() override; 48 void Exit() override;
49 keyboard::KeyboardUI* CreateKeyboardUI() override; 49 keyboard::KeyboardUI* CreateKeyboardUI() override;
50 void ShelfInit() override; 50 void ShelfInit() override;
51 void ShelfShutdown() override; 51 void ShelfShutdown() override;
52 void OpenUrlFromArc(const GURL& url) override; 52 void OpenUrlFromArc(const GURL& url) override;
53 SystemTrayDelegate* CreateSystemTrayDelegate() override; 53 SystemTrayDelegate* CreateSystemTrayDelegate() override;
54 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 54 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
(...skipping 25 matching lines...) Expand all
80 std::unique_ptr<ShelfInitializer> shelf_initializer_; 80 std::unique_ptr<ShelfInitializer> shelf_initializer_;
81 PrefService* active_user_pref_service_; // Not owned. 81 PrefService* active_user_pref_service_; // Not owned.
82 82
83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
84 }; 84 };
85 85
86 } // namespace test 86 } // namespace test
87 } // namespace ash 87 } // namespace ash
88 88
89 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 89 #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