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

Side by Side Diff: content/shell/browser/shell_content_browser_client.cc

Issue 359413005: Revert of Disable speech synthesis API for content/ layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/shell_content_browser_client.h" 5 #include "content/shell/browser/shell_content_browser_client.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 if (CommandLine::ForCurrentProcess()->HasSwitch( 230 if (CommandLine::ForCurrentProcess()->HasSwitch(
231 switches::kEnableLeakDetection)) 231 switches::kEnableLeakDetection))
232 command_line->AppendSwitch(switches::kEnableLeakDetection); 232 command_line->AppendSwitch(switches::kEnableLeakDetection);
233 if (CommandLine::ForCurrentProcess()->HasSwitch( 233 if (CommandLine::ForCurrentProcess()->HasSwitch(
234 switches::kRegisterFontFiles)) { 234 switches::kRegisterFontFiles)) {
235 command_line->AppendSwitchASCII( 235 command_line->AppendSwitchASCII(
236 switches::kRegisterFontFiles, 236 switches::kRegisterFontFiles,
237 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 237 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
238 switches::kRegisterFontFiles)); 238 switches::kRegisterFontFiles));
239 } 239 }
240
241 // Speech Synthesis backend lives in chrome/. See crbug.com/347045
242 // tracking moving it to content/.
243 command_line->AppendSwitch(switches::kDisableSpeechSynthesis);
244 } 240 }
245 241
246 void ShellContentBrowserClient::OverrideWebkitPrefs( 242 void ShellContentBrowserClient::OverrideWebkitPrefs(
247 RenderViewHost* render_view_host, 243 RenderViewHost* render_view_host,
248 const GURL& url, 244 const GURL& url,
249 WebPreferences* prefs) { 245 WebPreferences* prefs) {
250 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 246 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
251 return; 247 return;
252 WebKitTestController::Get()->OverrideWebkitPrefs(prefs); 248 WebKitTestController::Get()->OverrideWebkitPrefs(prefs);
253 } 249 }
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 ShellBrowserContext* 364 ShellBrowserContext*
369 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 365 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
370 BrowserContext* content_browser_context) { 366 BrowserContext* content_browser_context) {
371 if (content_browser_context == browser_context()) 367 if (content_browser_context == browser_context())
372 return browser_context(); 368 return browser_context();
373 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 369 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
374 return off_the_record_browser_context(); 370 return off_the_record_browser_context();
375 } 371 }
376 372
377 } // namespace content 373 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698