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

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

Issue 2533373002: Enabled/disable touch screen in TabletPowerButtonController (Closed)
Patch Set: incorporate comments from gab@ and afakhry@ Created 4 years 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_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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 TestSessionStateDelegate* CreateSessionStateDelegate() override; 53 TestSessionStateDelegate* CreateSessionStateDelegate() override;
54 AccessibilityDelegate* CreateAccessibilityDelegate() override; 54 AccessibilityDelegate* CreateAccessibilityDelegate() override;
55 MediaDelegate* CreateMediaDelegate() override; 55 MediaDelegate* CreateMediaDelegate() override;
56 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 56 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
57 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 57 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
58 const ShelfItem* item) override; 58 const ShelfItem* item) override;
59 GPUSupport* CreateGPUSupport() override; 59 GPUSupport* CreateGPUSupport() override;
60 base::string16 GetProductName() const override; 60 base::string16 GetProductName() const override;
61 gfx::Image GetDeprecatedAcceleratorImage() const override; 61 gfx::Image GetDeprecatedAcceleratorImage() const override;
62 62
63 bool IsTouchscreenEnabledInPrefs(bool is_local) const override;
64 void SetTouchscreenEnabledInPrefs(bool enabled, bool is_local) override;
65 void UpdateTouchscreenStatusFromPrefs() override;
66
63 int num_exit_requests() const { return num_exit_requests_; } 67 int num_exit_requests() const { return num_exit_requests_; }
64 68
65 app_list::AppListPresenterImpl* app_list_presenter() { 69 app_list::AppListPresenterImpl* app_list_presenter() {
66 return app_list_presenter_.get(); 70 return app_list_presenter_.get();
67 } 71 }
68 72
69 void SetMediaCaptureState(MediaCaptureState state); 73 void SetMediaCaptureState(MediaCaptureState state);
70 void SetForceMaximizeOnFirstRun(bool maximize) { 74 void SetForceMaximizeOnFirstRun(bool maximize) {
71 force_maximize_on_first_run_ = maximize; 75 force_maximize_on_first_run_ = maximize;
72 } 76 }
73 77
74 private: 78 private:
75 int num_exit_requests_; 79 int num_exit_requests_;
76 bool multi_profiles_enabled_; 80 bool multi_profiles_enabled_;
77 bool force_maximize_on_first_run_; 81 bool force_maximize_on_first_run_;
82 bool touch_screen_enabled_in_local_pref_;
Daniel Erat 2016/12/02 21:48:56 nit: s/touch_screen/touchscreen/ (since the method
Qiang(Joe) Xu 2016/12/02 23:55:11 Done.
78 83
79 std::unique_ptr<app_list::AppListPresenterDelegateFactory> 84 std::unique_ptr<app_list::AppListPresenterDelegateFactory>
80 app_list_presenter_delegate_factory_; 85 app_list_presenter_delegate_factory_;
81 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; 86 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
82 87
83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 88 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
84 }; 89 };
85 90
86 } // namespace test 91 } // namespace test
87 } // namespace ash 92 } // namespace ash
88 93
89 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 94 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698