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

Side by Side Diff: content/shell/shell_browser_main_parts.cc

Issue 11828028: [content shell] W3C SVG tests need to run in a smaller window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 11 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 | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_devtools_delegate.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) 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 #include "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/shell_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 127 }
128 } 128 }
129 #endif 129 #endif
130 devtools_delegate_ = new ShellDevToolsDelegate(browser_context_.get(), port); 130 devtools_delegate_ = new ShellDevToolsDelegate(browser_context_.get(), port);
131 131
132 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { 132 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
133 Shell::CreateNewWindow(browser_context_.get(), 133 Shell::CreateNewWindow(browser_context_.get(),
134 GetStartupURL(), 134 GetStartupURL(),
135 NULL, 135 NULL,
136 MSG_ROUTING_NONE, 136 MSG_ROUTING_NONE,
137 NULL); 137 gfx::Size());
138 } 138 }
139 139
140 if (parameters_.ui_task) { 140 if (parameters_.ui_task) {
141 parameters_.ui_task->Run(); 141 parameters_.ui_task->Run();
142 delete parameters_.ui_task; 142 delete parameters_.ui_task;
143 run_message_loop_ = false; 143 run_message_loop_ = false;
144 } 144 }
145 } 145 }
146 146
147 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 147 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
148 return !run_message_loop_; 148 return !run_message_loop_;
149 } 149 }
150 150
151 void ShellBrowserMainParts::PostMainMessageLoopRun() { 151 void ShellBrowserMainParts::PostMainMessageLoopRun() {
152 #if defined(USE_AURA) 152 #if defined(USE_AURA)
153 Shell::PlatformExit(); 153 Shell::PlatformExit();
154 #endif 154 #endif
155 if (devtools_delegate_) 155 if (devtools_delegate_)
156 devtools_delegate_->Stop(); 156 devtools_delegate_->Stop();
157 browser_context_.reset(); 157 browser_context_.reset();
158 off_the_record_browser_context_.reset(); 158 off_the_record_browser_context_.reset();
159 } 159 }
160 160
161 } // namespace 161 } // namespace
OLDNEW
« no previous file with comments | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_devtools_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698