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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/test/test_views_delegate_aura.cc

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« ash/shell/content_client/shell_browser_main_parts.h ('K') | « ui/views/controls/webview/webview_unittest.cc ('k') | ui/views/test/test_views_delegate_mac.mm » ('j') | ui/views/views_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/test_views_delegate_aura.cc
diff --git a/ui/views/test/test_views_delegate_aura.cc b/ui/views/test/test_views_delegate_aura.cc
index a6329762bdcedc7b4a41fcfbfcd5fa849172367e..ccd2bb2a4cbf5e5927cb33be4f5a2863469367da 100644
--- a/ui/views/test/test_views_delegate_aura.cc
+++ b/ui/views/test/test_views_delegate_aura.cc
@@ -18,16 +18,12 @@ TestViewsDelegate::TestViewsDelegate()
: context_factory_(nullptr),
use_desktop_native_widgets_(false),
use_transparent_windows_(false) {
- DCHECK(!ViewsDelegate::views_delegate);
- ViewsDelegate::views_delegate = this;
#if defined(USE_AURA)
wm_state_.reset(new wm::WMState);
#endif
}
TestViewsDelegate::~TestViewsDelegate() {
- if (ViewsDelegate::views_delegate == this)
- ViewsDelegate::views_delegate = NULL;
}
#if defined(OS_WIN)
« ash/shell/content_client/shell_browser_main_parts.h ('K') | « ui/views/controls/webview/webview_unittest.cc ('k') | ui/views/test/test_views_delegate_mac.mm » ('j') | ui/views/views_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698