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

Side by Side Diff: chrome/test/render_view_test.cc

Issue 3935001: Rename CommandLine::ARGUMENTS_ONLY to NO_PROGRAM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 2 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 | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/startup/startup_test.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/test/render_view_test.h" 5 #include "chrome/test/render_view_test.h"
6 6
7 #include "chrome/browser/extensions/extension_function_dispatcher.h" 7 #include "chrome/browser/extensions/extension_function_dispatcher.h"
8 #include "chrome/common/extensions/extension.h" 8 #include "chrome/common/extensions/extension.h"
9 #include "chrome/common/native_web_keyboard_event.h" 9 #include "chrome/common/native_web_keyboard_event.h"
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 GetMainFrame()->loadRequest(WebURLRequest(url)); 69 GetMainFrame()->loadRequest(WebURLRequest(url));
70 70
71 // The load actually happens asynchronously, so we pump messages to process 71 // The load actually happens asynchronously, so we pump messages to process
72 // the pending continuation. 72 // the pending continuation.
73 ProcessPendingMessages(); 73 ProcessPendingMessages();
74 } 74 }
75 75
76 void RenderViewTest::SetUp() { 76 void RenderViewTest::SetUp() {
77 sandbox_init_wrapper_.reset(new SandboxInitWrapper()); 77 sandbox_init_wrapper_.reset(new SandboxInitWrapper());
78 command_line_.reset(new CommandLine(CommandLine::ARGUMENTS_ONLY)); 78 command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
79 params_.reset(new MainFunctionParams(*command_line_, *sandbox_init_wrapper_, 79 params_.reset(new MainFunctionParams(*command_line_, *sandbox_init_wrapper_,
80 NULL)); 80 NULL));
81 platform_.reset(new RendererMainPlatformDelegate(*params_)); 81 platform_.reset(new RendererMainPlatformDelegate(*params_));
82 platform_->PlatformInitialize(); 82 platform_->PlatformInitialize();
83 83
84 // Setting flags and really doing anything with WebKit is fairly fragile and 84 // Setting flags and really doing anything with WebKit is fairly fragile and
85 // hacky, but this is the world we live in... 85 // hacky, but this is the world we live in...
86 webkit_glue::SetJavaScriptFlags(" --expose-gc"); 86 webkit_glue::SetJavaScriptFlags(" --expose-gc");
87 WebKit::initialize(&webkitclient_); 87 WebKit::initialize(&webkitclient_);
88 WebScriptController::registerExtension(BaseJsV8Extension::Get()); 88 WebScriptController::registerExtension(BaseJsV8Extension::Get());
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 mouse_event.button = WebMouseEvent::ButtonLeft; 321 mouse_event.button = WebMouseEvent::ButtonLeft;
322 mouse_event.x = bounds.CenterPoint().x(); 322 mouse_event.x = bounds.CenterPoint().x();
323 mouse_event.y = bounds.CenterPoint().y(); 323 mouse_event.y = bounds.CenterPoint().y();
324 mouse_event.clickCount = 1; 324 mouse_event.clickCount = 1;
325 ViewMsg_HandleInputEvent input_event(0); 325 ViewMsg_HandleInputEvent input_event(0);
326 input_event.WriteData(reinterpret_cast<const char*>(&mouse_event), 326 input_event.WriteData(reinterpret_cast<const char*>(&mouse_event),
327 sizeof(WebMouseEvent)); 327 sizeof(WebMouseEvent));
328 view_->OnHandleInputEvent(input_event); 328 view_->OnHandleInputEvent(input_event);
329 return true; 329 return true;
330 } 330 }
OLDNEW
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/startup/startup_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698