| OLD | NEW |
| 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_TEST_TEST_WEB_CONTENTS_H_ | 5 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
| 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ | 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
| 7 | 7 |
| 8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
| 9 #include "content/public/common/page_transition_types.h" | 9 #include "content/public/common/page_transition_types.h" |
| 10 #include "content/public/test/web_contents_tester.h" | 10 #include "content/public/test/web_contents_tester.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 const string16& error_description); | 100 const string16& error_description); |
| 101 | 101 |
| 102 protected: | 102 protected: |
| 103 // The deprecated WebContentsTester still needs to subclass this. | 103 // The deprecated WebContentsTester still needs to subclass this. |
| 104 explicit TestWebContents(BrowserContext* browser_context); | 104 explicit TestWebContents(BrowserContext* browser_context); |
| 105 | 105 |
| 106 private: | 106 private: |
| 107 // WebContentsImpl overrides | 107 // WebContentsImpl overrides |
| 108 virtual void CreateNewWindow( | 108 virtual void CreateNewWindow( |
| 109 int route_id, | 109 int route_id, |
| 110 int main_frame_route_id, |
| 110 const ViewHostMsg_CreateWindow_Params& params, | 111 const ViewHostMsg_CreateWindow_Params& params, |
| 111 SessionStorageNamespace* session_storage_namespace) OVERRIDE; | 112 SessionStorageNamespace* session_storage_namespace) OVERRIDE; |
| 112 virtual void CreateNewWidget(int route_id, | 113 virtual void CreateNewWidget(int route_id, |
| 113 WebKit::WebPopupType popup_type) OVERRIDE; | 114 WebKit::WebPopupType popup_type) OVERRIDE; |
| 114 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; | 115 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; |
| 115 virtual void ShowCreatedWindow(int route_id, | 116 virtual void ShowCreatedWindow(int route_id, |
| 116 WindowOpenDisposition disposition, | 117 WindowOpenDisposition disposition, |
| 117 const gfx::Rect& initial_pos, | 118 const gfx::Rect& initial_pos, |
| 118 bool user_gesture) OVERRIDE; | 119 bool user_gesture) OVERRIDE; |
| 119 virtual void ShowCreatedWidget(int route_id, | 120 virtual void ShowCreatedWidget(int route_id, |
| 120 const gfx::Rect& initial_pos) OVERRIDE; | 121 const gfx::Rect& initial_pos) OVERRIDE; |
| 121 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; | 122 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; |
| 122 | 123 |
| 123 | 124 |
| 124 RenderViewHostDelegateView* delegate_view_override_; | 125 RenderViewHostDelegateView* delegate_view_override_; |
| 125 | 126 |
| 126 // Expectations for arguments of |SetHistoryLengthAndPrune()|. | 127 // Expectations for arguments of |SetHistoryLengthAndPrune()|. |
| 127 bool expect_set_history_length_and_prune_; | 128 bool expect_set_history_length_and_prune_; |
| 128 scoped_refptr<const SiteInstanceImpl> | 129 scoped_refptr<const SiteInstanceImpl> |
| 129 expect_set_history_length_and_prune_site_instance_; | 130 expect_set_history_length_and_prune_site_instance_; |
| 130 int expect_set_history_length_and_prune_history_length_; | 131 int expect_set_history_length_and_prune_history_length_; |
| 131 int32 expect_set_history_length_and_prune_min_page_id_; | 132 int32 expect_set_history_length_and_prune_min_page_id_; |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 } // namespace content | 135 } // namespace content |
| 135 | 136 |
| 136 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ | 137 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
| OLD | NEW |