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

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

Issue 16564006: Test theory for Android FrameTreeNode crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try fischman's build file change 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
« no previous file with comments | « no previous file | content/content_tests.gypi » ('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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 796
797 // Indicates if the tab is considered crashed. 797 // Indicates if the tab is considered crashed.
798 base::TerminationStatus crashed_status_; 798 base::TerminationStatus crashed_status_;
799 int crashed_error_code_; 799 int crashed_error_code_;
800 800
801 // Whether this WebContents is waiting for a first-response for the 801 // Whether this WebContents is waiting for a first-response for the
802 // main resource of the page. This controls whether the throbber state is 802 // main resource of the page. This controls whether the throbber state is
803 // "waiting" or "loading." 803 // "waiting" or "loading."
804 bool waiting_for_response_; 804 bool waiting_for_response_;
805 805
806 // Any extra pointer will break frame_tree_root_.reset on Android.
807 scoped_ptr<RenderViewHost> extra_pointer_;
808
806 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific 809 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific
807 // to a given tab and SiteInstance, and must be valid for the lifetime of the 810 // to a given tab and SiteInstance, and must be valid for the lifetime of the
808 // WebContentsImpl. 811 // WebContentsImpl.
809 std::map<int32, int32> max_page_ids_; 812 std::map<int32, int32> max_page_ids_;
810 813
811 // System time at which the current load was started. 814 // System time at which the current load was started.
812 base::TimeTicks current_load_start_; 815 base::TimeTicks current_load_start_;
813 816
814 // The current load state and the URL associated with it. 817 // The current load state and the URL associated with it.
815 net::LoadStateWithParam load_state_; 818 net::LoadStateWithParam load_state_;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 // Maps the ids of pending image downloads to their callbacks 947 // Maps the ids of pending image downloads to their callbacks
945 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 948 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
946 ImageDownloadMap image_download_map_; 949 ImageDownloadMap image_download_map_;
947 950
948 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 951 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
949 }; 952 };
950 953
951 } // namespace content 954 } // namespace content
952 955
953 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 956 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698