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

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix silly compile error Created 7 years, 4 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
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/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 // painting is enabled. See http://crbug.com/250777 138 // painting is enabled. See http://crbug.com/250777
139 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting); 139 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting);
140 #endif 140 #endif
141 141
142 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) 142 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing))
143 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); 143 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
144 144
145 command_line.AppendSwitch(switches::kEnableInbandTextTracks); 145 command_line.AppendSwitch(switches::kEnableInbandTextTracks);
146 command_line.AppendSwitch(switches::kMuteAudio); 146 command_line.AppendSwitch(switches::kMuteAudio);
147 147
148 net::CookieMonster::EnableFileScheme();
149
150 // Unless/until WebM files are added to the media layout tests, we need to 148 // Unless/until WebM files are added to the media layout tests, we need to
151 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 149 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
152 #if !defined(OS_ANDROID) 150 #if !defined(OS_ANDROID)
153 net::RemoveProprietaryMediaTypesAndCodecsForTests(); 151 net::RemoveProprietaryMediaTypesAndCodecsForTests();
154 #endif 152 #endif
155 153
156 if (!WebKitTestPlatformInitialize()) { 154 if (!WebKitTestPlatformInitialize()) {
157 if (exit_code) 155 if (exit_code)
158 *exit_code = 1; 156 *exit_code = 1;
159 return true; 157 return true;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 browser_client_.reset(new ShellContentBrowserClient); 219 browser_client_.reset(new ShellContentBrowserClient);
222 return browser_client_.get(); 220 return browser_client_.get();
223 } 221 }
224 222
225 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 223 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
226 renderer_client_.reset(new ShellContentRendererClient); 224 renderer_client_.reset(new ShellContentRendererClient);
227 return renderer_client_.get(); 225 return renderer_client_.get();
228 } 226 }
229 227
230 } // namespace content 228 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698