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

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

Issue 290733004: Don't spin the loading indicator for in-page navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better? Created 6 years, 7 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 virtual void SetParentNativeViewAccessible( 195 virtual void SetParentNativeViewAccessible(
196 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 196 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
197 #endif 197 #endif
198 virtual const base::string16& GetTitle() const OVERRIDE; 198 virtual const base::string16& GetTitle() const OVERRIDE;
199 virtual int32 GetMaxPageID() OVERRIDE; 199 virtual int32 GetMaxPageID() OVERRIDE;
200 virtual int32 GetMaxPageIDForSiteInstance( 200 virtual int32 GetMaxPageIDForSiteInstance(
201 SiteInstance* site_instance) OVERRIDE; 201 SiteInstance* site_instance) OVERRIDE;
202 virtual SiteInstance* GetSiteInstance() const OVERRIDE; 202 virtual SiteInstance* GetSiteInstance() const OVERRIDE;
203 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE; 203 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE;
204 virtual bool IsLoading() const OVERRIDE; 204 virtual bool IsLoading() const OVERRIDE;
205 virtual bool IsLoadingToDifferentDocument() const OVERRIDE;
205 virtual bool IsWaitingForResponse() const OVERRIDE; 206 virtual bool IsWaitingForResponse() const OVERRIDE;
206 virtual const net::LoadStateWithParam& GetLoadState() const OVERRIDE; 207 virtual const net::LoadStateWithParam& GetLoadState() const OVERRIDE;
207 virtual const base::string16& GetLoadStateHost() const OVERRIDE; 208 virtual const base::string16& GetLoadStateHost() const OVERRIDE;
208 virtual uint64 GetUploadSize() const OVERRIDE; 209 virtual uint64 GetUploadSize() const OVERRIDE;
209 virtual uint64 GetUploadPosition() const OVERRIDE; 210 virtual uint64 GetUploadPosition() const OVERRIDE;
210 virtual std::set<GURL> GetSitesInTab() const OVERRIDE; 211 virtual std::set<GURL> GetSitesInTab() const OVERRIDE;
211 virtual const std::string& GetEncoding() const OVERRIDE; 212 virtual const std::string& GetEncoding() const OVERRIDE;
212 virtual bool DisplayedInsecureContent() const OVERRIDE; 213 virtual bool DisplayedInsecureContent() const OVERRIDE;
213 virtual void IncrementCapturerCount(const gfx::Size& capture_size) OVERRIDE; 214 virtual void IncrementCapturerCount(const gfx::Size& capture_size) OVERRIDE;
214 virtual void DecrementCapturerCount() OVERRIDE; 215 virtual void DecrementCapturerCount() OVERRIDE;
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 FrameTree frame_tree_; 934 FrameTree frame_tree_;
934 935
935 // SavePackage, lazily created. 936 // SavePackage, lazily created.
936 scoped_refptr<SavePackage> save_package_; 937 scoped_refptr<SavePackage> save_package_;
937 938
938 // Data for loading state ---------------------------------------------------- 939 // Data for loading state ----------------------------------------------------
939 940
940 // Indicates whether we're currently loading a resource. 941 // Indicates whether we're currently loading a resource.
941 bool is_loading_; 942 bool is_loading_;
942 943
944 // Indicates whether the current load is to a different document. Only valid
945 // if is_loading_ is true.
946 bool is_load_to_different_document_;
947
943 // Indicates if the tab is considered crashed. 948 // Indicates if the tab is considered crashed.
944 base::TerminationStatus crashed_status_; 949 base::TerminationStatus crashed_status_;
945 int crashed_error_code_; 950 int crashed_error_code_;
946 951
947 // Whether this WebContents is waiting for a first-response for the 952 // Whether this WebContents is waiting for a first-response for the
948 // main resource of the page. This controls whether the throbber state is 953 // main resource of the page. This controls whether the throbber state is
949 // "waiting" or "loading." 954 // "waiting" or "loading."
950 bool waiting_for_response_; 955 bool waiting_for_response_;
951 956
952 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific 957 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 bool last_dialog_suppressed_; 1131 bool last_dialog_suppressed_;
1127 1132
1128 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_; 1133 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;
1129 1134
1130 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1135 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1131 }; 1136 };
1132 1137
1133 } // namespace content 1138 } // namespace content
1134 1139
1135 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1140 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.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