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

Unified Diff: content/shell/shell.h

Issue 10802064: Make content_shell and content_browsertests working with aura (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update DEPS file Created 8 years, 5 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
Index: content/shell/shell.h
diff --git a/content/shell/shell.h b/content/shell/shell.h
index 53e473fa59aaa8f3e923bbeb3070504b13bbb7c7..5ed2586aeb16a6e3a9f38b1b92305b939c2ff15e 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -24,6 +24,16 @@
typedef struct _GtkToolItem GtkToolItem;
#elif defined(OS_ANDROID)
#include "base/android/scoped_java_ref.h"
+#elif defined(USE_AURA)
+namespace views {
+class Widget;
+class ViewsDelegate;
+}
+namespace aura {
+namespace client {
+class StackingClient;
+}
+}
#endif
class GURL;
@@ -195,6 +205,11 @@ class Shell : public WebContentsDelegate,
int content_height_;
#elif defined(OS_ANDROID)
base::android::ScopedJavaGlobalRef<jobject> java_object_;
+#elif defined(USE_AURA)
+ static aura::client::StackingClient* stacking_client_;
+ static views::ViewsDelegate* views_delegate_;
+
+ views::Widget* window_widget_;
#endif
// A container of all the open windows. We use a vector so we can keep track
« content/shell/DEPS ('K') | « content/shell/DEPS ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698