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

Side by Side Diff: ash/test/test_shell_delegate.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_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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual void OpenFeedbackPage() OVERRIDE; 60 virtual void OpenFeedbackPage() OVERRIDE;
61 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 61 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
62 virtual void HandleMediaNextTrack() OVERRIDE; 62 virtual void HandleMediaNextTrack() OVERRIDE;
63 virtual void HandleMediaPlayPause() OVERRIDE; 63 virtual void HandleMediaPlayPause() OVERRIDE;
64 virtual void HandleMediaPrevTrack() OVERRIDE; 64 virtual void HandleMediaPrevTrack() OVERRIDE;
65 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 65 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
66 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE; 66 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
67 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; 67 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
68 virtual double GetSavedScreenMagnifierScale() OVERRIDE; 68 virtual double GetSavedScreenMagnifierScale() OVERRIDE;
69 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE; 69 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
70 virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
71 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 70 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
72 71
73 int num_exit_requests() const { return num_exit_requests_; } 72 int num_exit_requests() const { return num_exit_requests_; }
74 private: 73 private:
75 friend class ash::test::AshTestBase; 74 friend class ash::test::AshTestBase;
76 75
77 // Given |session_started| will update internal state. 76 // Given |session_started| will update internal state.
78 // If |session_started| is true this method will also set 77 // If |session_started| is true this method will also set
79 // |user_logged_in_| to true. 78 // |user_logged_in_| to true.
80 // When session is started it always means that user has logged in. 79 // When session is started it always means that user has logged in.
(...skipping 23 matching lines...) Expand all
104 103
105 scoped_ptr<content::BrowserContext> current_browser_context_; 104 scoped_ptr<content::BrowserContext> current_browser_context_;
106 105
107 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 106 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
108 }; 107 };
109 108
110 } // namespace test 109 } // namespace test
111 } // namespace ash 110 } // namespace ash
112 111
113 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 112 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698