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

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: Remove rank from test 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 12 matching lines...) Expand all
23 #include "content/browser/tab_contents/navigation_controller.h" 23 #include "content/browser/tab_contents/navigation_controller.h"
24 #include "content/browser/tab_contents/navigation_entry.h" 24 #include "content/browser/tab_contents/navigation_entry.h"
25 #include "content/browser/tab_contents/page_navigator.h" 25 #include "content/browser/tab_contents/page_navigator.h"
26 #include "content/browser/tab_contents/render_view_host_manager.h" 26 #include "content/browser/tab_contents/render_view_host_manager.h"
27 #include "content/browser/tab_contents/tab_contents_observer.h" 27 #include "content/browser/tab_contents/tab_contents_observer.h"
28 #include "content/browser/webui/web_ui.h" 28 #include "content/browser/webui/web_ui.h"
29 #include "content/common/property_bag.h" 29 #include "content/common/property_bag.h"
30 #include "content/common/renderer_preferences.h" 30 #include "content/common/renderer_preferences.h"
31 #include "net/base/load_states.h" 31 #include "net/base/load_states.h"
32 #include "ui/gfx/native_widget_types.h" 32 #include "ui/gfx/native_widget_types.h"
33 #include "webkit/glue/resource_type.h"
33 34
34 #if defined(OS_WIN) 35 #if defined(OS_WIN)
35 #include "base/win/scoped_handle.h" 36 #include "base/win/scoped_handle.h"
36 #endif 37 #endif
37 38
38 namespace gfx { 39 namespace gfx {
39 class Rect; 40 class Rect;
40 } 41 }
41 42
42 class DownloadItem; 43 class DownloadItem;
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 void OnDidRedirectProvisionalLoad(int32 page_id, 545 void OnDidRedirectProvisionalLoad(int32 page_id,
545 bool has_opener_set, 546 bool has_opener_set,
546 const GURL& source_url, 547 const GURL& source_url,
547 const GURL& target_url); 548 const GURL& target_url);
548 void OnDidFailProvisionalLoadWithError(int64 frame_id, 549 void OnDidFailProvisionalLoadWithError(int64 frame_id,
549 bool main_frame, 550 bool main_frame,
550 int error_code, 551 int error_code,
551 const GURL& url, 552 const GURL& url,
552 bool showing_repost_interstitial); 553 bool showing_repost_interstitial);
553 void OnDidLoadResourceFromMemoryCache(const GURL& url, 554 void OnDidLoadResourceFromMemoryCache(const GURL& url,
554 const std::string& security_info); 555 const std::string& security_info,
556 const std::string& http_request,
557 ResourceType::Type resource_type);
555 void OnDidDisplayInsecureContent(); 558 void OnDidDisplayInsecureContent();
556 void OnDidRunInsecureContent(const std::string& security_origin, 559 void OnDidRunInsecureContent(const std::string& security_origin,
557 const GURL& target_url); 560 const GURL& target_url);
558 void OnDocumentLoadedInFrame(int64 frame_id); 561 void OnDocumentLoadedInFrame(int64 frame_id);
559 void OnDidFinishLoad(int64 frame_id); 562 void OnDidFinishLoad(int64 frame_id);
560 void OnUpdateContentRestrictions(int restrictions); 563 void OnUpdateContentRestrictions(int restrictions);
561 void OnGoToEntryAtOffset(int offset); 564 void OnGoToEntryAtOffset(int offset);
562 void OnUpdateZoomLimits(int minimum_percent, 565 void OnUpdateZoomLimits(int minimum_percent,
563 int maximum_percent, 566 int maximum_percent,
564 bool remember); 567 bool remember);
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 ObserverList<TabContentsObserver> observers_; 855 ObserverList<TabContentsObserver> observers_;
853 856
854 // Content restrictions, used to disable print/copy etc based on content's 857 // Content restrictions, used to disable print/copy etc based on content's
855 // (full-page plugins for now only) permissions. 858 // (full-page plugins for now only) permissions.
856 int content_restrictions_; 859 int content_restrictions_;
857 860
858 DISALLOW_COPY_AND_ASSIGN(TabContents); 861 DISALLOW_COPY_AND_ASSIGN(TabContents);
859 }; 862 };
860 863
861 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 864 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698