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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('K') | « ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 69c5b2f44a8f567170a4288df8c584b1ddf81b19..494d95f18e8597fa537c4c3d7ab0f65120ac96f8 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -1216,8 +1216,10 @@ void DesktopWindowTreeHostX11::InitX11Window(
// If we have a delegate which is providing a default window icon, use that
// icon.
- gfx::ImageSkia* window_icon = ViewsDelegate::views_delegate ?
- ViewsDelegate::views_delegate->GetDefaultWindowIcon() : NULL;
+ gfx::ImageSkia* window_icon =
+ ViewsDelegate::GetInstance()
+ ? ViewsDelegate::GetInstance()->GetDefaultWindowIcon()
+ : NULL;
if (window_icon) {
SetWindowIcons(gfx::ImageSkia(), *window_icon);
}
« ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('K') | « ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698