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

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

Issue 8142032: Add error description to the DidFailProvisionalLoad callback. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed unnecessary change Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class SkBitmap; 51 class SkBitmap;
52 class TabContentsDelegate; 52 class TabContentsDelegate;
53 class TabContentsObserver; 53 class TabContentsObserver;
54 class TabContentsView; 54 class TabContentsView;
55 struct ThumbnailScore; 55 struct ThumbnailScore;
56 class URLPattern; 56 class URLPattern;
57 struct ViewHostMsg_FrameNavigate_Params; 57 struct ViewHostMsg_FrameNavigate_Params;
58 struct WebPreferences; 58 struct WebPreferences;
59 class WebUI; 59 class WebUI;
60 struct ViewHostMsg_RunFileChooser_Params; 60 struct ViewHostMsg_RunFileChooser_Params;
61 struct ViewHostMsg_DidFailProvisionalLoadWithError_Params;
mmenke 2011/10/07 14:19:44 nit: Alphabetize.
mkosiba (inactive) 2011/10/07 15:46:11 Done.
61 62
62 // Describes what goes in the main content area of a tab. TabContents is 63 // Describes what goes in the main content area of a tab. TabContents is
63 // the only type of TabContents, and these should be merged together. 64 // the only type of TabContents, and these should be merged together.
64 class CONTENT_EXPORT TabContents : public PageNavigator, 65 class CONTENT_EXPORT TabContents : public PageNavigator,
65 public RenderViewHostDelegate, 66 public RenderViewHostDelegate,
66 public RenderViewHostManager::Delegate, 67 public RenderViewHostManager::Delegate,
67 public content::JavaScriptDialogDelegate { 68 public content::JavaScriptDialogDelegate {
68 public: 69 public:
69 // Flags passed to the TabContentsDelegate.NavigationStateChanged to tell it 70 // Flags passed to the TabContentsDelegate.NavigationStateChanged to tell it
70 // what has changed. Combine them to update more than one thing. 71 // what has changed. Combine them to update more than one thing.
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 516
516 // Message handlers. 517 // Message handlers.
517 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 518 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
518 bool main_frame, 519 bool main_frame,
519 bool has_opener_set, 520 bool has_opener_set,
520 const GURL& url); 521 const GURL& url);
521 void OnDidRedirectProvisionalLoad(int32 page_id, 522 void OnDidRedirectProvisionalLoad(int32 page_id,
522 bool has_opener_set, 523 bool has_opener_set,
523 const GURL& source_url, 524 const GURL& source_url,
524 const GURL& target_url); 525 const GURL& target_url);
525 void OnDidFailProvisionalLoadWithError(int64 frame_id, 526 void OnDidFailProvisionalLoadWithError(
526 bool main_frame, 527 const ViewHostMsg_DidFailProvisionalLoadWithError_Params& ipc_params);
mmenke 2011/10/07 14:19:44 nit: ipc_params -> params
mkosiba (inactive) 2011/10/07 15:46:11 Done.
527 int error_code,
528 const GURL& url,
529 bool showing_repost_interstitial);
530 void OnDidLoadResourceFromMemoryCache(const GURL& url, 528 void OnDidLoadResourceFromMemoryCache(const GURL& url,
531 const std::string& security_info, 529 const std::string& security_info,
532 const std::string& http_request, 530 const std::string& http_request,
533 ResourceType::Type resource_type); 531 ResourceType::Type resource_type);
534 void OnDidDisplayInsecureContent(); 532 void OnDidDisplayInsecureContent();
535 void OnDidRunInsecureContent(const std::string& security_origin, 533 void OnDidRunInsecureContent(const std::string& security_origin,
536 const GURL& target_url); 534 const GURL& target_url);
537 void OnDocumentLoadedInFrame(int64 frame_id); 535 void OnDocumentLoadedInFrame(int64 frame_id);
538 void OnDidFinishLoad(int64 frame_id); 536 void OnDidFinishLoad(int64 frame_id);
539 void OnUpdateContentRestrictions(int restrictions); 537 void OnUpdateContentRestrictions(int restrictions);
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 ObserverList<TabContentsObserver> observers_; 853 ObserverList<TabContentsObserver> observers_;
856 854
857 // Content restrictions, used to disable print/copy etc based on content's 855 // Content restrictions, used to disable print/copy etc based on content's
858 // (full-page plugins for now only) permissions. 856 // (full-page plugins for now only) permissions.
859 int content_restrictions_; 857 int content_restrictions_;
860 858
861 DISALLOW_COPY_AND_ASSIGN(TabContents); 859 DISALLOW_COPY_AND_ASSIGN(TabContents);
862 }; 860 };
863 861
864 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 862 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698