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

Side by Side Diff: ash/shell/shell_delegate_impl.h

Issue 2688353005: Fix shelf alignment and auto-hide initialization. (Closed)
Patch Set: Fix mash_unittests by installing a TestShellDelegate. Created 3 years, 10 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 (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_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_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 const ShelfItem* item) override; 45 const ShelfItem* item) override;
46 GPUSupport* CreateGPUSupport() override; 46 GPUSupport* CreateGPUSupport() override;
47 base::string16 GetProductName() const override; 47 base::string16 GetProductName() const override;
48 gfx::Image GetDeprecatedAcceleratorImage() const override; 48 gfx::Image GetDeprecatedAcceleratorImage() const override;
49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
50 void SetTouchscreenEnabledInPrefs(bool enabled, 50 void SetTouchscreenEnabledInPrefs(bool enabled,
51 bool use_local_state) override; 51 bool use_local_state) override;
52 void UpdateTouchscreenStatusFromPrefs() override; 52 void UpdateTouchscreenStatusFromPrefs() override;
53 53
54 private: 54 private:
55 ShelfDelegate* shelf_delegate_ = nullptr;
56
57 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
58 }; 56 };
59 57
60 } // namespace shell 58 } // namespace shell
61 } // namespace ash 59 } // namespace ash
62 60
63 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 61 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698