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

Unified Diff: content/shell/browser/shell.h

Issue 344833004: aura: Make sure TestScreen objects are destroyed properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 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
« no previous file with comments | « chrome/browser/sync/sync_error_notifier_ash_unittest.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index 2b0d59eb5fc927ac81945a86aeb53242a9f4e695..22424d91751c146fd9a815b238195209d3b52c57 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -22,6 +22,9 @@
#include "base/android/scoped_java_ref.h"
#elif defined(USE_AURA)
#if defined(OS_CHROMEOS)
+namespace gfx {
+class Screen;
+}
namespace wm {
class WMTestHelper;
}
@@ -236,6 +239,7 @@ class Shell : public WebContentsDelegate,
#elif defined(USE_AURA)
#if defined(OS_CHROMEOS)
static wm::WMTestHelper* wm_test_helper_;
+ static gfx::Screen* test_screen_;
#endif
#if defined(TOOLKIT_VIEWS)
static views::ViewsDelegate* views_delegate_;
« no previous file with comments | « chrome/browser/sync/sync_error_notifier_ash_unittest.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698