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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/shell/shell.h

Issue 10035034: Implement the skeleton of an android content shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed drawable png as it was checked in separately. Created 8 years, 8 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
« base/android/jni_registrar.h ('K') | « content/shell/android/shell_view.cc ('k') | content/shell/shell_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell.h
diff --git a/content/shell/shell.h b/content/shell/shell.h
index c1831689e1a42f3883f6a1e9e470e15d11ac85cb..a15430d0b17b9a5d2bbe48fa812fbebb980593f3 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -21,6 +21,8 @@
#include "ui/base/gtk/gtk_signal.h"
typedef struct _GtkToolItem GtkToolItem;
+#elif defined(OS_ANDROID)
+#include "content/shell/android/shell_view.h"
#endif
class GURL;
@@ -177,6 +179,8 @@ class Shell : public WebContentsDelegate,
int content_width_;
int content_height_;
+#elif defined(OS_ANDROID)
+ scoped_ptr<ShellView> shell_view_;
#endif
// A container of all the open windows. We use a vector so we can keep track
« base/android/jni_registrar.h ('K') | « content/shell/android/shell_view.cc ('k') | content/shell/shell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698