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

Side by Side Diff: trunk/src/content/test/test_web_contents.h

Issue 16232014: Revert 203261 "split webkit/glue/webpreferences to common and re..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/content/shell/webkit_test_controller.h ('k') | trunk/src/ppapi/shared_impl/DEPS » ('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_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"
11 #include "webkit/common/webpreferences.h" 11 #include "webkit/glue/webpreferences.h"
12 12
13 class SiteInstanceImpl; 13 class SiteInstanceImpl;
14 14
15 namespace content { 15 namespace content {
16 16
17 class RenderViewHost; 17 class RenderViewHost;
18 class TestRenderViewHost; 18 class TestRenderViewHost;
19 class WebContentsTester; 19 class WebContentsTester;
20 20
21 // Subclass WebContentsImpl to ensure it creates TestRenderViewHosts 21 // Subclass WebContentsImpl to ensure it creates TestRenderViewHosts
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 bool expect_set_history_length_and_prune_; 127 bool expect_set_history_length_and_prune_;
128 scoped_refptr<const SiteInstanceImpl> 128 scoped_refptr<const SiteInstanceImpl>
129 expect_set_history_length_and_prune_site_instance_; 129 expect_set_history_length_and_prune_site_instance_;
130 int expect_set_history_length_and_prune_history_length_; 130 int expect_set_history_length_and_prune_history_length_;
131 int32 expect_set_history_length_and_prune_min_page_id_; 131 int32 expect_set_history_length_and_prune_min_page_id_;
132 }; 132 };
133 133
134 } // namespace content 134 } // namespace content
135 135
136 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 136 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW
« no previous file with comments | « trunk/src/content/shell/webkit_test_controller.h ('k') | trunk/src/ppapi/shared_impl/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698