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

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

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix for unit_tests 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 void AttachWebViewHelpers(content::WebContents* contents); 242 void AttachWebViewHelpers(content::WebContents* contents);
243 243
244 void OnWebViewNewWindowResponse(int new_window_instance_id, 244 void OnWebViewNewWindowResponse(int new_window_instance_id,
245 bool allow, 245 bool allow,
246 const std::string& user_input); 246 const std::string& user_input);
247 247
248 // WebContentsObserver implementation. 248 // WebContentsObserver implementation.
249 virtual void DidCommitProvisionalLoadForFrame( 249 virtual void DidCommitProvisionalLoadForFrame(
250 content::RenderFrameHost* render_frame_host, 250 content::RenderFrameHost* render_frame_host,
251 const GURL& url, 251 const GURL& url,
252 bool url_is_unreachable,
252 ui::PageTransition transition_type) OVERRIDE; 253 ui::PageTransition transition_type) OVERRIDE;
253 virtual void DidFailProvisionalLoad( 254 virtual void DidFailProvisionalLoad(
254 content::RenderFrameHost* render_frame_host, 255 content::RenderFrameHost* render_frame_host,
255 const GURL& validated_url, 256 const GURL& validated_url,
256 int error_code, 257 int error_code,
257 const base::string16& error_description) OVERRIDE; 258 const base::string16& error_description) OVERRIDE;
258 virtual void DidStartProvisionalLoadForFrame( 259 virtual void DidStartProvisionalLoadForFrame(
259 content::RenderFrameHost* render_frame_host, 260 content::RenderFrameHost* render_frame_host,
260 const GURL& validated_url, 261 const GURL& validated_url,
261 bool is_error_page, 262 bool is_error_page,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 359
359 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap; 360 typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
360 PendingWindowMap pending_new_windows_; 361 PendingWindowMap pending_new_windows_;
361 362
362 DISALLOW_COPY_AND_ASSIGN(WebViewGuest); 363 DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
363 }; 364 };
364 365
365 } // namespace extensions 366 } // namespace extensions
366 367
367 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 368 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698