diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 08:58:13 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 08:58:13 +0000 |
| commit | 222f40c4369bdd988b7d895ed885ae1a23561e74 (patch) | |
| tree | 54877702b66bcd2d75949d7a4e1f23bbc8626cdb /ash/test | |
| parent | 2d7250e86b77a044e35f59e6b754d48acdd3ff5d (diff) | |
| download | chromium_src-222f40c4369bdd988b7d895ed885ae1a23561e74.zip chromium_src-222f40c4369bdd988b7d895ed885ae1a23561e74.tar.gz chromium_src-222f40c4369bdd988b7d895ed885ae1a23561e74.tar.bz2 | |
ash : Decouple power button controller and session state controller.
Prepare code to introduce two versions of SessionStateController later.
BUG=138171, 139461
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162140
Review URL: https://chromiumcodereview.appspot.com/11091023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 4 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index b8d118b..4614f10 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -19,7 +19,8 @@ namespace test { TestShellDelegate::TestShellDelegate() : locked_(false), - spoken_feedback_enabled_(false) { + spoken_feedback_enabled_(false), + num_exit_requests_(0) { } TestShellDelegate::~TestShellDelegate() { @@ -53,6 +54,7 @@ void TestShellDelegate::Shutdown() { } void TestShellDelegate::Exit() { + num_exit_requests_++; } void TestShellDelegate::NewTab() { diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index cbdcc4a..8c196c9 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -55,9 +55,12 @@ class TestShellDelegate : public ShellDelegate { virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; virtual double GetSavedScreenMagnifierScale() OVERRIDE; + int num_exit_requests() const { return num_exit_requests_; } private: bool locked_; bool spoken_feedback_enabled_; + int num_exit_requests_; + scoped_ptr<content::BrowserContext> current_browser_context_; DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |