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

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

Issue 14283005: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 6 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 const std::string& encoding) OVERRIDE; 343 const std::string& encoding) OVERRIDE;
344 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE; 344 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE;
345 virtual void Close(RenderViewHost* render_view_host) OVERRIDE; 345 virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
346 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE; 346 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE;
347 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE; 347 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE;
348 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE; 348 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE;
349 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE; 349 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
350 virtual void DidCancelLoading() OVERRIDE; 350 virtual void DidCancelLoading() OVERRIDE;
351 virtual void DidChangeLoadProgress(double progress) OVERRIDE; 351 virtual void DidChangeLoadProgress(double progress) OVERRIDE;
352 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE; 352 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE;
353 virtual void DidAccessInitialDocument() OVERRIDE;
353 virtual void DocumentAvailableInMainFrame( 354 virtual void DocumentAvailableInMainFrame(
354 RenderViewHost* render_view_host) OVERRIDE; 355 RenderViewHost* render_view_host) OVERRIDE;
355 virtual void DocumentOnLoadCompletedInMainFrame( 356 virtual void DocumentOnLoadCompletedInMainFrame(
356 RenderViewHost* render_view_host, 357 RenderViewHost* render_view_host,
357 int32 page_id) OVERRIDE; 358 int32 page_id) OVERRIDE;
358 virtual void RequestOpenURL(RenderViewHost* rvh, 359 virtual void RequestOpenURL(RenderViewHost* rvh,
359 const GURL& url, 360 const GURL& url,
360 const Referrer& referrer, 361 const Referrer& referrer,
361 WindowOpenDisposition disposition, 362 WindowOpenDisposition disposition,
362 int64 source_frame_id, 363 int64 source_frame_id,
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 // Maps the ids of pending image downloads to their callbacks 938 // Maps the ids of pending image downloads to their callbacks
938 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 939 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
939 ImageDownloadMap image_download_map_; 940 ImageDownloadMap image_download_map_;
940 941
941 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 942 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
942 }; 943 };
943 944
944 } // namespace content 945 } // namespace content
945 946
946 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 947 #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