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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SimpleMessageBoxViews asan failure. Created 7 years, 11 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 | Annotate | Revision Log
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 "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 62 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
63 virtual void HandleMediaNextTrack() OVERRIDE; 63 virtual void HandleMediaNextTrack() OVERRIDE;
64 virtual void HandleMediaPlayPause() OVERRIDE; 64 virtual void HandleMediaPlayPause() OVERRIDE;
65 virtual void HandleMediaPrevTrack() OVERRIDE; 65 virtual void HandleMediaPrevTrack() OVERRIDE;
66 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 66 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
67 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE; 67 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
68 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; 68 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
69 virtual double GetSavedScreenMagnifierScale() OVERRIDE; 69 virtual double GetSavedScreenMagnifierScale() OVERRIDE;
70 virtual ui::MenuModel* CreateContextMenu( 70 virtual ui::MenuModel* CreateContextMenu(
71 aura::RootWindow* root_window) OVERRIDE; 71 aura::RootWindow* root_window) OVERRIDE;
72 virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
73 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 72 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
74 73
75 private: 74 private:
76 // Used to update Launcher. Owned by main. 75 // Used to update Launcher. Owned by main.
77 WindowWatcher* watcher_; 76 WindowWatcher* watcher_;
78 77
79 LauncherDelegateImpl* launcher_delegate_; 78 LauncherDelegateImpl* launcher_delegate_;
80 79
81 bool locked_; 80 bool locked_;
82 bool spoken_feedback_enabled_; 81 bool spoken_feedback_enabled_;
83 bool high_contrast_enabled_; 82 bool high_contrast_enabled_;
84 bool screen_magnifier_enabled_; 83 bool screen_magnifier_enabled_;
85 MagnifierType screen_magnifier_type_; 84 MagnifierType screen_magnifier_type_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 86 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
88 }; 87 };
89 88
90 } // namespace shell 89 } // namespace shell
91 } // namespace ash 90 } // namespace ash
92 91
93 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 92 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698