diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 05:39:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 05:39:28 +0000 |
| commit | b2e2a4a64d51a355e78983ea540edc88b4958020 (patch) | |
| tree | ebf476cb52418f2a896375eb10eb03ebe929c5ce /ash/test/ash_test_helper.cc | |
| parent | 7650dbdee7a7c2881352ea47792b45ba2b13314a (diff) | |
| download | chromium_src-b2e2a4a64d51a355e78983ea540edc88b4958020.zip chromium_src-b2e2a4a64d51a355e78983ea540edc88b4958020.tar.gz chromium_src-b2e2a4a64d51a355e78983ea540edc88b4958020.tar.bz2 | |
Add OnDisplaysInitialized to DisplayController::Observer
this is a place for actions when displays are initialized after startup.
BUG=None
Review URL: https://codereview.chromium.org/199323003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 33dbb83..f66c6ce 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -63,7 +63,8 @@ void AshTestHelper::SetUp(bool start_session) { ui::InitializeContextFactoryForTests(enable_pixel_output); // Creates Shell and hook with Desktop. - test_shell_delegate_ = new TestShellDelegate; + if (!test_shell_delegate_) + test_shell_delegate_ = new TestShellDelegate; // Creates MessageCenter since g_browser_process is not created in AshTestBase // tests. |