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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_guest.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 4
5 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 5 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
6 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 6 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 void AttachWebViewHelpers(content::WebContents* contents); 239 void AttachWebViewHelpers(content::WebContents* contents);
240 240
241 void OnWebViewNewWindowResponse(int new_window_instance_id, 241 void OnWebViewNewWindowResponse(int new_window_instance_id,
242 bool allow, 242 bool allow,
243 const std::string& user_input); 243 const std::string& user_input);
244 244
245 // WebContentsObserver implementation. 245 // WebContentsObserver implementation.
246 virtual void DidCommitProvisionalLoadForFrame( 246 virtual void DidCommitProvisionalLoadForFrame(
247 content::RenderFrameHost* render_frame_host, 247 content::RenderFrameHost* render_frame_host,
248 const GURL& url, 248 const GURL& url,
249 content::PageTransition transition_type) OVERRIDE; 249 ui::PageTransition transition_type) OVERRIDE;
250 virtual void DidFailProvisionalLoad( 250 virtual void DidFailProvisionalLoad(
251 content::RenderFrameHost* render_frame_host, 251 content::RenderFrameHost* render_frame_host,
252 const GURL& validated_url, 252 const GURL& validated_url,
253 int error_code, 253 int error_code,
254 const base::string16& error_description) OVERRIDE; 254 const base::string16& error_description) OVERRIDE;
255 virtual void DidStartProvisionalLoadForFrame( 255 virtual void DidStartProvisionalLoadForFrame(
256 content::RenderFrameHost* render_frame_host, 256 content::RenderFrameHost* render_frame_host,
257 const GURL& validated_url, 257 const GURL& validated_url,
258 bool is_error_page, 258 bool is_error_page,
259 bool is_iframe_srcdoc) OVERRIDE; 259 bool is_iframe_srcdoc) OVERRIDE;
(...skipping 15 matching lines...) Expand all
275 void LoadRedirect(const GURL& old_url, 275 void LoadRedirect(const GURL& old_url,
276 const GURL& new_url, 276 const GURL& new_url,
277 bool is_top_level); 277 bool is_top_level);
278 278
279 void PushWebViewStateToIOThread(); 279 void PushWebViewStateToIOThread();
280 static void RemoveWebViewStateFromIOThread( 280 static void RemoveWebViewStateFromIOThread(
281 content::WebContents* web_contents); 281 content::WebContents* web_contents);
282 282
283 void LoadURLWithParams(const GURL& url, 283 void LoadURLWithParams(const GURL& url,
284 const content::Referrer& referrer, 284 const content::Referrer& referrer,
285 content::PageTransition transition_type, 285 ui::PageTransition transition_type,
286 content::WebContents* web_contents); 286 content::WebContents* web_contents);
287 287
288 void RequestNewWindowPermission( 288 void RequestNewWindowPermission(
289 WindowOpenDisposition disposition, 289 WindowOpenDisposition disposition,
290 const gfx::Rect& initial_bounds, 290 const gfx::Rect& initial_bounds,
291 bool user_gesture, 291 bool user_gesture,
292 content::WebContents* new_contents); 292 content::WebContents* new_contents);
293 293
294 // Destroy unattached new windows that have been opened by this 294 // Destroy unattached new windows that have been opened by this
295 // WebViewGuest. 295 // WebViewGuest.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 352
353 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap; 353 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
354 PendingWindowMap pending_new_windows_; 354 PendingWindowMap pending_new_windows_;
355 355
356 DISALLOW_COPY_AND_ASSIGN(WebViewGuest); 356 DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
357 }; 357 };
358 358
359 } // namespace extensions 359 } // namespace extensions
360 360
361 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 361 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698