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

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

Issue 12541018: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix title in new and cloned tabs. 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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 const std::string& encoding) OVERRIDE; 322 const std::string& encoding) OVERRIDE;
323 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE; 323 virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE;
324 virtual void Close(RenderViewHost* render_view_host) OVERRIDE; 324 virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
325 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE; 325 virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE;
326 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE; 326 virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE;
327 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE; 327 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE;
328 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE; 328 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
329 virtual void DidCancelLoading() OVERRIDE; 329 virtual void DidCancelLoading() OVERRIDE;
330 virtual void DidChangeLoadProgress(double progress) OVERRIDE; 330 virtual void DidChangeLoadProgress(double progress) OVERRIDE;
331 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE; 331 virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE;
332 virtual void DidAccessInitialDocument() OVERRIDE;
332 virtual void DidUpdateFrameTree(RenderViewHost* rvh) OVERRIDE; 333 virtual void DidUpdateFrameTree(RenderViewHost* rvh) OVERRIDE;
333 virtual void DocumentAvailableInMainFrame( 334 virtual void DocumentAvailableInMainFrame(
334 RenderViewHost* render_view_host) OVERRIDE; 335 RenderViewHost* render_view_host) OVERRIDE;
335 virtual void DocumentOnLoadCompletedInMainFrame( 336 virtual void DocumentOnLoadCompletedInMainFrame(
336 RenderViewHost* render_view_host, 337 RenderViewHost* render_view_host,
337 int32 page_id) OVERRIDE; 338 int32 page_id) OVERRIDE;
338 virtual void RequestOpenURL(RenderViewHost* rvh, 339 virtual void RequestOpenURL(RenderViewHost* rvh,
339 const GURL& url, 340 const GURL& url,
340 const Referrer& referrer, 341 const Referrer& referrer,
341 WindowOpenDisposition disposition, 342 WindowOpenDisposition disposition,
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 // Maps the ids of pending favicon downloads to their callbacks 876 // Maps the ids of pending favicon downloads to their callbacks
876 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap; 877 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
877 FaviconDownloadMap favicon_download_map_; 878 FaviconDownloadMap favicon_download_map_;
878 879
879 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 880 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
880 }; 881 };
881 882
882 } // namespace content 883 } // namespace content
883 884
884 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 885 #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