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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 years, 1 month 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
« 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 "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 48 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
49 virtual void OpenFeedbackPage() OVERRIDE; 49 virtual void OpenFeedbackPage() OVERRIDE;
50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
51 virtual void HandleMediaNextTrack() OVERRIDE; 51 virtual void HandleMediaNextTrack() OVERRIDE;
52 virtual void HandleMediaPlayPause() OVERRIDE; 52 virtual void HandleMediaPlayPause() OVERRIDE;
53 virtual void HandleMediaPrevTrack() OVERRIDE; 53 virtual void HandleMediaPrevTrack() OVERRIDE;
54 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 54 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
55 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; 55 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
56 virtual double GetSavedScreenMagnifierScale() OVERRIDE; 56 virtual double GetSavedScreenMagnifierScale() OVERRIDE;
57 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE; 57 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
58 virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
58 59
59 int num_exit_requests() const { return num_exit_requests_; } 60 int num_exit_requests() const { return num_exit_requests_; }
60 private: 61 private:
61 bool locked_; 62 bool locked_;
62 bool spoken_feedback_enabled_; 63 bool spoken_feedback_enabled_;
63 int num_exit_requests_; 64 int num_exit_requests_;
64 65
65 scoped_ptr<content::BrowserContext> current_browser_context_; 66 scoped_ptr<content::BrowserContext> current_browser_context_;
66 67
67 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 68 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
68 }; 69 };
69 70
70 } // namespace test 71 } // namespace test
71 } // namespace ash 72 } // namespace ash
72 73
73 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 74 #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