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

Side by Side Diff: content/shell/browser/shell.h

Issue 789533002: Fullscreen: make fullscreen requests come from RenderFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update webcontentsdelegateandroid Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 WindowOpenDisposition disposition, 120 WindowOpenDisposition disposition,
121 const gfx::Rect& initial_pos, 121 const gfx::Rect& initial_pos,
122 bool user_gesture, 122 bool user_gesture,
123 bool* was_blocked) override; 123 bool* was_blocked) override;
124 void LoadingStateChanged(WebContents* source, 124 void LoadingStateChanged(WebContents* source,
125 bool to_different_document) override; 125 bool to_different_document) override;
126 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
127 virtual void LoadProgressChanged(WebContents* source, 127 virtual void LoadProgressChanged(WebContents* source,
128 double progress) override; 128 double progress) override;
129 #endif 129 #endif
130 void ToggleFullscreenModeForTab(WebContents* web_contents, 130 void EnterFullscreenModeForTab(WebContents* web_contents,
131 bool enter_fullscreen) override; 131 const GURL& origin) override;
132 void ExitFullscreenModeForTab(WebContents* web_contents) override;
132 bool IsFullscreenForTabOrPending( 133 bool IsFullscreenForTabOrPending(
133 const WebContents* web_contents) const override; 134 const WebContents* web_contents) const override;
134 void RequestToLockMouse(WebContents* web_contents, 135 void RequestToLockMouse(WebContents* web_contents,
135 bool user_gesture, 136 bool user_gesture,
136 bool last_unlocked_by_target) override; 137 bool last_unlocked_by_target) override;
137 void CloseContents(WebContents* source) override; 138 void CloseContents(WebContents* source) override;
138 bool CanOverscrollContent() const override; 139 bool CanOverscrollContent() const override;
139 void DidNavigateMainFramePostCommit(WebContents* web_contents) override; 140 void DidNavigateMainFramePostCommit(WebContents* web_contents) override;
140 JavaScriptDialogManager* GetJavaScriptDialogManager( 141 JavaScriptDialogManager* GetJavaScriptDialogManager(
141 WebContents* source) override; 142 WebContents* source) override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 bool enter_fullscreen); 205 bool enter_fullscreen);
205 bool PlatformIsFullscreenForTabOrPending( 206 bool PlatformIsFullscreenForTabOrPending(
206 const WebContents* web_contents) const; 207 const WebContents* web_contents) const;
207 #endif 208 #endif
208 #if defined(TOOLKIT_VIEWS) 209 #if defined(TOOLKIT_VIEWS)
209 void PlatformWebContentsFocused(WebContents* contents); 210 void PlatformWebContentsFocused(WebContents* contents);
210 #endif 211 #endif
211 212
212 gfx::NativeView GetContentView(); 213 gfx::NativeView GetContentView();
213 214
215 void ToggleFullscreenModeForTab(WebContents* web_contents,
216 bool enter_fullscreen);
214 // WebContentsObserver 217 // WebContentsObserver
215 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override; 218 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
216 219
217 void InnerShowDevTools(const std::string& settings, 220 void InnerShowDevTools(const std::string& settings,
218 const std::string& frontend_url); 221 const std::string& frontend_url);
219 void OnDevToolsWebContentsDestroyed(); 222 void OnDevToolsWebContentsDestroyed();
220 223
221 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; 224 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
222 225
223 scoped_ptr<WebContents> web_contents_; 226 scoped_ptr<WebContents> web_contents_;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 static base::Callback<void(Shell*)> shell_created_callback_; 259 static base::Callback<void(Shell*)> shell_created_callback_;
257 260
258 // True if the destructur of Shell should post a quit closure on the current 261 // True if the destructur of Shell should post a quit closure on the current
259 // message loop if the destructed Shell object was the last one. 262 // message loop if the destructed Shell object was the last one.
260 static bool quit_message_loop_; 263 static bool quit_message_loop_;
261 }; 264 };
262 265
263 } // namespace content 266 } // namespace content
264 267
265 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 268 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698