summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormohsen <mohsen@chromium.org>2015-06-09 23:49:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-10 06:50:32 +0000
commit0ff8c0e1c8c805bce8e216c74c66ccc8fd137a6f (patch)
tree3fb14cb8ad0cf444f139b47cd4983c043067b302 /apps
parent78356a0007b25ab468c34310386537cb24fd19f2 (diff)
downloadchromium_src-0ff8c0e1c8c805bce8e216c74c66ccc8fd137a6f.zip
chromium_src-0ff8c0e1c8c805bce8e216c74c66ccc8fd137a6f.tar.gz
chromium_src-0ff8c0e1c8c805bce8e216c74c66ccc8fd137a6f.tar.bz2
Refactor ViewsDelegate singleton
Currently, the variable containing ViewsDelegate singleton object can be set by anyone and there are cases (at least in tests) where it is freely replaced without properly deleting the old one which can lead to situations where multiple ViewsDelegate objects are in existence. This patch tries to ensure that there is at most one instance available at each time. Also, cleaned up some ViewsDelegate related includes. BUG=492991 Review URL: https://codereview.chromium.org/1159033008 Cr-Commit-Position: refs/heads/master@{#333692}
Diffstat (limited to 'apps')
-rw-r--r--apps/ui/views/app_window_frame_view.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index 60645d0..4b6246b 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -20,7 +20,6 @@
#include "ui/strings/grit/ui_strings.h" // Accessibility names
#include "ui/views/controls/button/image_button.h"
#include "ui/views/layout/grid_layout.h"
-#include "ui/views/views_delegate.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"