summaryrefslogtreecommitdiffstats
path: root/ash/extended_desktop_unittest.cc
diff options
context:
space:
mode:
authorbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 13:25:43 +0000
committerbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 13:25:43 +0000
commit091489588de414de3a4ffd386895b49808ce8ae9 (patch)
tree5d2b71a06403c8f1d9c5af852611b813081383af /ash/extended_desktop_unittest.cc
parent8f6af03725c187128d3689614ff22bb8d0477979 (diff)
downloadchromium_src-091489588de414de3a4ffd386895b49808ce8ae9.zip
chromium_src-091489588de414de3a4ffd386895b49808ce8ae9.tar.gz
chromium_src-091489588de414de3a4ffd386895b49808ce8ae9.tar.bz2
Add DCHECK to ensure SetContentsView is not called incorrectlly.
I foolishly did this and it caused a hard to track down crash. BUG=None Review URL: https://chromiumcodereview.appspot.com/12529004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
-rw-r--r--ash/extended_desktop_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index d69a918..45d01ed 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -696,7 +696,7 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
views::Widget* lock_widget = CreateTestWidget(
Shell::GetScreen()->GetPrimaryDisplay().bounds());
views::Textfield* textfield = new views::Textfield;
- lock_widget->SetContentsView(textfield);
+ lock_widget->client_view()->AddChildView(textfield);
ash::Shell::GetContainer(
Shell::GetPrimaryRootWindow(),