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

Side by Side Diff: chrome/browser/tab_contents/interstitial_page.h

Issue 3386014: This adds some plumbing for propagating the status and error code of a (Closed)
Patch Set: Fixed Mac code to handle both SEGV and BUS Created 10 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/process_util.h"
12 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
13 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 14 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
14 #include "chrome/common/notification_observer.h" 15 #include "chrome/common/notification_observer.h"
15 #include "chrome/common/notification_registrar.h" 16 #include "chrome/common/notification_registrar.h"
16 #include "chrome/common/renderer_preferences.h" 17 #include "chrome/common/renderer_preferences.h"
17 #include "gfx/size.h" 18 #include "gfx/size.h"
18 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
19 20
20 class NavigationEntry; 21 class NavigationEntry;
21 class TabContents; 22 class TabContents;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 114
114 protected: 115 protected:
115 // NotificationObserver method: 116 // NotificationObserver method:
116 virtual void Observe(NotificationType type, 117 virtual void Observe(NotificationType type,
117 const NotificationSource& source, 118 const NotificationSource& source,
118 const NotificationDetails& details); 119 const NotificationDetails& details);
119 120
120 // RenderViewHostDelegate implementation: 121 // RenderViewHostDelegate implementation:
121 virtual View* GetViewDelegate(); 122 virtual View* GetViewDelegate();
122 virtual const GURL& GetURL() const; 123 virtual const GURL& GetURL() const;
123 virtual void RenderViewGone(RenderViewHost* render_view_host); 124 virtual void RenderViewGone(RenderViewHost* render_view_host,
125 base::TerminationStatus status,
126 int error_code);
124 virtual void DidNavigate(RenderViewHost* render_view_host, 127 virtual void DidNavigate(RenderViewHost* render_view_host,
125 const ViewHostMsg_FrameNavigate_Params& params); 128 const ViewHostMsg_FrameNavigate_Params& params);
126 virtual void UpdateTitle(RenderViewHost* render_view_host, 129 virtual void UpdateTitle(RenderViewHost* render_view_host,
127 int32 page_id, 130 int32 page_id,
128 const std::wstring& title); 131 const std::wstring& title);
129 virtual void DomOperationResponse(const std::string& json_string, 132 virtual void DomOperationResponse(const std::string& json_string,
130 int automation_id); 133 int automation_id);
131 virtual RendererPreferences GetRendererPrefs(Profile* profile) const { 134 virtual RendererPreferences GetRendererPrefs(Profile* profile) const {
132 return renderer_preferences_; 135 return renderer_preferences_;
133 } 136 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap; 236 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap;
234 static InterstitialPageMap* tab_to_interstitial_page_; 237 static InterstitialPageMap* tab_to_interstitial_page_;
235 238
236 // Settings passed to the renderer. 239 // Settings passed to the renderer.
237 RendererPreferences renderer_preferences_; 240 RendererPreferences renderer_preferences_;
238 241
239 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); 242 DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
240 }; 243 };
241 244
242 #endif // CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 245 #endif // CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc ('k') | chrome/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698