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

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: make try happy Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 WindowOpenDisposition disposition, 119 WindowOpenDisposition disposition,
120 const gfx::Rect& initial_pos, 120 const gfx::Rect& initial_pos,
121 bool user_gesture, 121 bool user_gesture,
122 bool* was_blocked) override; 122 bool* was_blocked) override;
123 void LoadingStateChanged(WebContents* source, 123 void LoadingStateChanged(WebContents* source,
124 bool to_different_document) override; 124 bool to_different_document) override;
125 #if defined(OS_ANDROID) 125 #if defined(OS_ANDROID)
126 virtual void LoadProgressChanged(WebContents* source, 126 virtual void LoadProgressChanged(WebContents* source,
127 double progress) override; 127 double progress) override;
128 #endif 128 #endif
129 void ToggleFullscreenModeForTab(WebContents* web_contents, 129 void EnterFullscreenModeForTab(WebContents* web_contents,
130 bool enter_fullscreen) override; 130 const GURL& origin) override;
131 void ExitFullscreenModeForTab(WebContents* web_contents) override;
131 bool IsFullscreenForTabOrPending( 132 bool IsFullscreenForTabOrPending(
132 const WebContents* web_contents) const override; 133 const WebContents* web_contents) const override;
133 void RequestToLockMouse(WebContents* web_contents, 134 void RequestToLockMouse(WebContents* web_contents,
134 bool user_gesture, 135 bool user_gesture,
135 bool last_unlocked_by_target) override; 136 bool last_unlocked_by_target) override;
136 void CloseContents(WebContents* source) override; 137 void CloseContents(WebContents* source) override;
137 bool CanOverscrollContent() const override; 138 bool CanOverscrollContent() const override;
138 void DidNavigateMainFramePostCommit(WebContents* web_contents) override; 139 void DidNavigateMainFramePostCommit(WebContents* web_contents) override;
139 JavaScriptDialogManager* GetJavaScriptDialogManager( 140 JavaScriptDialogManager* GetJavaScriptDialogManager(
140 WebContents* source) override; 141 WebContents* source) override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 bool enter_fullscreen); 204 bool enter_fullscreen);
204 bool PlatformIsFullscreenForTabOrPending( 205 bool PlatformIsFullscreenForTabOrPending(
205 const WebContents* web_contents) const; 206 const WebContents* web_contents) const;
206 #endif 207 #endif
207 #if defined(TOOLKIT_VIEWS) 208 #if defined(TOOLKIT_VIEWS)
208 void PlatformWebContentsFocused(WebContents* contents); 209 void PlatformWebContentsFocused(WebContents* contents);
209 #endif 210 #endif
210 211
211 gfx::NativeView GetContentView(); 212 gfx::NativeView GetContentView();
212 213
214 void ToggleFullscreenModeForTab(WebContents* web_contents,
215 bool enter_fullscreen);
213 // WebContentsObserver 216 // WebContentsObserver
214 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override; 217 void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
215 218
216 void InnerShowDevTools(const std::string& settings, 219 void InnerShowDevTools(const std::string& settings,
217 const std::string& frontend_url); 220 const std::string& frontend_url);
218 void OnDevToolsWebContentsDestroyed(); 221 void OnDevToolsWebContentsDestroyed();
219 222
220 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; 223 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
221 224
222 scoped_ptr<WebContents> web_contents_; 225 scoped_ptr<WebContents> web_contents_;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 static base::Callback<void(Shell*)> shell_created_callback_; 258 static base::Callback<void(Shell*)> shell_created_callback_;
256 259
257 // True if the destructur of Shell should post a quit closure on the current 260 // True if the destructur of Shell should post a quit closure on the current
258 // message loop if the destructed Shell object was the last one. 261 // message loop if the destructed Shell object was the last one.
259 static bool quit_message_loop_; 262 static bool quit_message_loop_;
260 }; 263 };
261 264
262 } // namespace content 265 } // namespace content
263 266
264 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 267 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698