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

Side by Side Diff: chrome/browser/prerender/prerender_contents.h

Issue 6672065: Support touch icon in FaviconHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error for clank mac and unit test memory leak Created 9 years, 8 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 CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "chrome/browser/prerender/prerender_final_status.h" 14 #include "chrome/browser/prerender/prerender_final_status.h"
15 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 15 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
16 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" 16 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
17 #include "chrome/common/icon_messages.h"
17 #include "chrome/common/prerender_constants.h" 18 #include "chrome/common/prerender_constants.h"
18 #include "chrome/common/view_types.h" 19 #include "chrome/common/view_types.h"
19 #include "content/browser/renderer_host/render_view_host_delegate.h" 20 #include "content/browser/renderer_host/render_view_host_delegate.h"
20 #include "content/common/notification_registrar.h" 21 #include "content/common/notification_registrar.h"
21 #include "content/common/window_container_type.h" 22 #include "content/common/window_container_type.h"
22 #include "webkit/glue/window_open_disposition.h" 23 #include "webkit/glue/window_open_disposition.h"
23 24
24 class TabContents; 25 class TabContents;
25 struct WebPreferences; 26 struct WebPreferences;
26 struct ViewHostMsg_FrameNavigate_Params; 27 struct ViewHostMsg_FrameNavigate_Params;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 friend class PrerenderContentsFactoryImpl; 205 friend class PrerenderContentsFactoryImpl;
205 206
206 // Message handlers. 207 // Message handlers.
207 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 208 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
208 bool main_frame, 209 bool main_frame,
209 const GURL& url); 210 const GURL& url);
210 void OnDidRedirectProvisionalLoad(int32 page_id, 211 void OnDidRedirectProvisionalLoad(int32 page_id,
211 const GURL& source_url, 212 const GURL& source_url,
212 const GURL& target_url); 213 const GURL& target_url);
213 214
214 void OnUpdateFaviconURL(int32 page_id, const GURL& icon_url); 215 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
215 216
216 void OnMaybeCancelPrerender(PrerenderCancellationReason reason); 217 void OnMaybeCancelPrerender(PrerenderCancellationReason reason);
217 218
218 // Adds an alias URL, for one of the many redirections. Returns whether 219 // Adds an alias URL, for one of the many redirections. Returns whether
219 // the URL is valid. 220 // the URL is valid.
220 bool AddAliasURL(const GURL& url); 221 bool AddAliasURL(const GURL& url);
221 222
222 // Remove |this| from the PrerenderManager, set a final status, and 223 // Remove |this| from the PrerenderManager, set a final status, and
223 // delete |this|. 224 // delete |this|.
224 void Destroy(FinalStatus reason); 225 void Destroy(FinalStatus reason);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // Maximum amount of private memory that may be used per PrerenderContents, 282 // Maximum amount of private memory that may be used per PrerenderContents,
282 // in MB. 283 // in MB.
283 static const int kMaxPrerenderPrivateMB = 100; 284 static const int kMaxPrerenderPrivateMB = 100;
284 285
285 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 286 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
286 }; 287 };
287 288
288 } // prerender 289 } // prerender
289 290
290 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 291 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/favicon_helper_unittest.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698