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

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

Issue 12602003: When a pending contents is created but deleted before it is shown, remove it from the list of pendi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 9 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
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 private: 471 private:
472 friend class NavigationControllerImpl; 472 friend class NavigationControllerImpl;
473 friend class WebContentsObserver; 473 friend class WebContentsObserver;
474 friend class WebContents; // To implement factory methods. 474 friend class WebContents; // To implement factory methods.
475 475
476 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, NoJSMessageOnInterstitials); 476 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, NoJSMessageOnInterstitials);
477 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, UpdateTitle); 477 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, UpdateTitle);
478 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, FindOpenerRVHWhenPending); 478 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, FindOpenerRVHWhenPending);
479 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, 479 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest,
480 CrossSiteCantPreemptAfterUnload); 480 CrossSiteCantPreemptAfterUnload);
481 FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, PendingContents);
481 FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles); 482 FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles);
482 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate); 483 FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate);
483 FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload); 484 FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload);
484 485
485 // So InterstitialPageImpl can access SetIsLoading. 486 // So InterstitialPageImpl can access SetIsLoading.
486 friend class InterstitialPageImpl; 487 friend class InterstitialPageImpl;
487 488
488 // TODO(brettw) TestWebContents shouldn't exist! 489 // TODO(brettw) TestWebContents shouldn't exist!
489 friend class TestWebContents; 490 friend class TestWebContents;
490 491
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 // Maps the ids of pending favicon downloads to their callbacks 887 // Maps the ids of pending favicon downloads to their callbacks
887 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap; 888 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
888 FaviconDownloadMap favicon_download_map_; 889 FaviconDownloadMap favicon_download_map_;
889 890
890 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 891 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
891 }; 892 };
892 893
893 } // namespace content 894 } // namespace content
894 895
895 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 896 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698