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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 13846007: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 const std::string& encoding) OVERRIDE; 320 const std::string& encoding) OVERRIDE;
321 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE; 321 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE;
322 virtual void Close(RenderViewHost* render_view_host) OVERRIDE; 322 virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
323 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE; 323 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE;
324 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE; 324 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE;
325 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE; 325 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE;
326 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE; 326 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
327 virtual void DidCancelLoading() OVERRIDE; 327 virtual void DidCancelLoading() OVERRIDE;
328 virtual void DidChangeLoadProgress(double progress) OVERRIDE; 328 virtual void DidChangeLoadProgress(double progress) OVERRIDE;
329 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE; 329 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE;
330 virtual void DidAccessInitialDocument() OVERRIDE;
330 virtual void DidUpdateFrameTree(RenderViewHost* rvh) OVERRIDE; 331 virtual void DidUpdateFrameTree(RenderViewHost* rvh) OVERRIDE;
331 virtual void DocumentAvailableInMainFrame( 332 virtual void DocumentAvailableInMainFrame(
332 RenderViewHost* render_view_host) OVERRIDE; 333 RenderViewHost* render_view_host) OVERRIDE;
333 virtual void DocumentOnLoadCompletedInMainFrame( 334 virtual void DocumentOnLoadCompletedInMainFrame(
334 RenderViewHost* render_view_host, 335 RenderViewHost* render_view_host,
335 int32 page_id) OVERRIDE; 336 int32 page_id) OVERRIDE;
336 virtual void RequestOpenURL(RenderViewHost* rvh, 337 virtual void RequestOpenURL(RenderViewHost* rvh,
337 const GURL& url, 338 const GURL& url,
338 const Referrer& referrer, 339 const Referrer& referrer,
339 WindowOpenDisposition disposition, 340 WindowOpenDisposition disposition,
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 // Maps the ids of pending image downloads to their callbacks 874 // Maps the ids of pending image downloads to their callbacks
874 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 875 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
875 ImageDownloadMap image_download_map_; 876 ImageDownloadMap image_download_map_;
876 877
877 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 878 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
878 }; 879 };
879 880
880 } // namespace content 881 } // namespace content
881 882
882 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 883 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698