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

Side by Side Diff: content/test/render_view_test.h

Issue 8587009: Add OVERRIDE to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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 | « content/test/mock_render_process.h ('k') | content/test/test_notification_tracker.h » ('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) 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_TEST_RENDER_VIEW_TEST_H_ 5 #ifndef CONTENT_TEST_RENDER_VIEW_TEST_H_
6 #define CONTENT_TEST_RENDER_VIEW_TEST_H_ 6 #define CONTENT_TEST_RENDER_VIEW_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // Returns the IPC message ID of the navigation message. 102 // Returns the IPC message ID of the navigation message.
103 uint32 GetNavigationIPCType(); 103 uint32 GetNavigationIPCType();
104 104
105 // These are all methods from RenderViewImpl that we expose to testing code. 105 // These are all methods from RenderViewImpl that we expose to testing code.
106 bool OnMessageReceived(const IPC::Message& msg); 106 bool OnMessageReceived(const IPC::Message& msg);
107 void DidNavigateWithinPage(WebKit::WebFrame* frame, bool is_new_navigation); 107 void DidNavigateWithinPage(WebKit::WebFrame* frame, bool is_new_navigation);
108 void SendContentStateImmediately(); 108 void SendContentStateImmediately();
109 WebKit::WebWidget* GetWebWidget(); 109 WebKit::WebWidget* GetWebWidget();
110 110
111 // testing::Test 111 // testing::Test
112 virtual void SetUp(); 112 virtual void SetUp() OVERRIDE;
113 113
114 virtual void TearDown(); 114 virtual void TearDown() OVERRIDE;
115 115
116 MessageLoop msg_loop_; 116 MessageLoop msg_loop_;
117 scoped_ptr<MockRenderProcess> mock_process_; 117 scoped_ptr<MockRenderProcess> mock_process_;
118 // We use a naked pointer because we don't want to expose RenderViewImpl in 118 // We use a naked pointer because we don't want to expose RenderViewImpl in
119 // the embedder's namespace. 119 // the embedder's namespace.
120 content::RenderView* view_; 120 content::RenderView* view_;
121 RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_; 121 RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_;
122 MockContentRendererClient mock_content_renderer_client_; 122 MockContentRendererClient mock_content_renderer_client_;
123 scoped_ptr<MockKeyboard> mock_keyboard_; 123 scoped_ptr<MockKeyboard> mock_keyboard_;
124 scoped_ptr<MockRenderThread> render_thread_; 124 scoped_ptr<MockRenderThread> render_thread_;
125 125
126 // Used to setup the process so renderers can run. 126 // Used to setup the process so renderers can run.
127 scoped_ptr<RendererMainPlatformDelegate> platform_; 127 scoped_ptr<RendererMainPlatformDelegate> platform_;
128 scoped_ptr<content::MainFunctionParams> params_; 128 scoped_ptr<content::MainFunctionParams> params_;
129 scoped_ptr<CommandLine> command_line_; 129 scoped_ptr<CommandLine> command_line_;
130 }; 130 };
131 131
132 } // namespace content 132 } // namespace content
133 133
134 #endif // CONTENT_TEST_RENDER_VIEW_TEST_H_ 134 #endif // CONTENT_TEST_RENDER_VIEW_TEST_H_
OLDNEW
« no previous file with comments | « content/test/mock_render_process.h ('k') | content/test/test_notification_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698