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

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 7461106: Inform disk cache of WebKit memory cache hits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move http check Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 11 matching lines...) Expand all
22 #include "content/browser/tab_contents/navigation_controller.h" 22 #include "content/browser/tab_contents/navigation_controller.h"
23 #include "content/browser/tab_contents/navigation_entry.h" 23 #include "content/browser/tab_contents/navigation_entry.h"
24 #include "content/browser/tab_contents/page_navigator.h" 24 #include "content/browser/tab_contents/page_navigator.h"
25 #include "content/browser/tab_contents/render_view_host_manager.h" 25 #include "content/browser/tab_contents/render_view_host_manager.h"
26 #include "content/browser/tab_contents/tab_contents_observer.h" 26 #include "content/browser/tab_contents/tab_contents_observer.h"
27 #include "content/browser/webui/web_ui.h" 27 #include "content/browser/webui/web_ui.h"
28 #include "content/common/property_bag.h" 28 #include "content/common/property_bag.h"
29 #include "content/common/renderer_preferences.h" 29 #include "content/common/renderer_preferences.h"
30 #include "net/base/load_states.h" 30 #include "net/base/load_states.h"
31 #include "ui/gfx/native_widget_types.h" 31 #include "ui/gfx/native_widget_types.h"
32 #include "webkit/glue/resource_type.h"
32 33
33 #if defined(OS_WIN) 34 #if defined(OS_WIN)
34 #include "base/win/scoped_handle.h" 35 #include "base/win/scoped_handle.h"
35 #endif 36 #endif
36 37
37 namespace gfx { 38 namespace gfx {
38 class Rect; 39 class Rect;
39 } 40 }
40 41
41 class DownloadItem; 42 class DownloadItem;
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 void OnDidRedirectProvisionalLoad(int32 page_id, 538 void OnDidRedirectProvisionalLoad(int32 page_id,
538 bool has_opener_set, 539 bool has_opener_set,
539 const GURL& source_url, 540 const GURL& source_url,
540 const GURL& target_url); 541 const GURL& target_url);
541 void OnDidFailProvisionalLoadWithError(int64 frame_id, 542 void OnDidFailProvisionalLoadWithError(int64 frame_id,
542 bool main_frame, 543 bool main_frame,
543 int error_code, 544 int error_code,
544 const GURL& url, 545 const GURL& url,
545 bool showing_repost_interstitial); 546 bool showing_repost_interstitial);
546 void OnDidLoadResourceFromMemoryCache(const GURL& url, 547 void OnDidLoadResourceFromMemoryCache(const GURL& url,
547 const std::string& security_info); 548 const std::string& security_info,
549 const std::string& http_request,
550 ResourceType::Type resource_type);
548 void OnDidDisplayInsecureContent(); 551 void OnDidDisplayInsecureContent();
549 void OnDidRunInsecureContent(const std::string& security_origin, 552 void OnDidRunInsecureContent(const std::string& security_origin,
550 const GURL& target_url); 553 const GURL& target_url);
551 void OnDocumentLoadedInFrame(int64 frame_id); 554 void OnDocumentLoadedInFrame(int64 frame_id);
552 void OnDidFinishLoad(int64 frame_id); 555 void OnDidFinishLoad(int64 frame_id);
553 void OnUpdateContentRestrictions(int restrictions); 556 void OnUpdateContentRestrictions(int restrictions);
554 void OnGoToEntryAtOffset(int offset); 557 void OnGoToEntryAtOffset(int offset);
555 void OnUpdateZoomLimits(int minimum_percent, 558 void OnUpdateZoomLimits(int minimum_percent,
556 int maximum_percent, 559 int maximum_percent,
557 bool remember); 560 bool remember);
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 ObserverList<TabContentsObserver> observers_; 848 ObserverList<TabContentsObserver> observers_;
846 849
847 // Content restrictions, used to disable print/copy etc based on content's 850 // Content restrictions, used to disable print/copy etc based on content's
848 // (full-page plugins for now only) permissions. 851 // (full-page plugins for now only) permissions.
849 int content_restrictions_; 852 int content_restrictions_;
850 853
851 DISALLOW_COPY_AND_ASSIGN(TabContents); 854 DISALLOW_COPY_AND_ASSIGN(TabContents);
852 }; 855 };
853 856
854 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 857 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698