Index: content/shell/shell.h |
diff --git a/content/shell/shell.h b/content/shell/shell.h |
index f22e03adc3f94e38701e23e8f3f9a9a575dd8070..6934c97261e97b489c4360900fad6a8f332c05cf 100644 |
--- a/content/shell/shell.h |
+++ b/content/shell/shell.h |
@@ -104,11 +104,11 @@ class Shell : public WebContentsDelegate, |
#if defined(OS_ANDROID) |
virtual void LoadProgressChanged(WebContents* source, |
double progress) OVERRIDE; |
- virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
+#endif |
+ virtual void ToggleFullscreenModeForTab(WebContents* web_contents, |
bool enter_fullscreen) OVERRIDE; |
virtual bool IsFullscreenForTabOrPending( |
- const content::WebContents* web_contents) const OVERRIDE; |
-#endif |
+ const WebContents* web_contents) const OVERRIDE; |
virtual void CloseContents(WebContents* source) OVERRIDE; |
virtual bool CanOverscrollContent() const OVERRIDE; |
virtual void WebContentsCreated(WebContents* source_contents, |
@@ -160,6 +160,12 @@ class Shell : public WebContentsDelegate, |
void PlatformSetIsLoading(bool loading); |
// Set the title of shell window |
void PlatformSetTitle(const string16& title); |
+#if defined(OS_ANDROID) |
+ void PlatformToggleFullscreenModeForTab(WebContents* web_contents, |
+ bool enter_fullscreen); |
+ bool PlatformIsFullscreenForTabOrPending( |
+ const WebContents* web_contents) const; |
+#endif |
#if (defined(OS_WIN) && !defined(USE_AURA)) || defined(TOOLKIT_GTK) |
// Resizes the main window to the given dimensions. |
@@ -197,6 +203,8 @@ class Shell : public WebContentsDelegate, |
scoped_ptr<WebContents> web_contents_; |
+ bool is_fullscreen_; |
+ |
gfx::NativeWindow window_; |
gfx::NativeEditView url_edit_view_; |