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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 964583002: Remove showModalDialog (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 9 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 | « chrome/common/chrome_switches.cc ('k') | content/browser/renderer_host/render_view_host_impl.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) 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 "chrome/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/allocator/allocator_extension.h" 10 #include "base/allocator/allocator_extension.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 ChromeContentRendererClient* client) 212 ChromeContentRendererClient* client)
213 : client_(client), 213 : client_(client),
214 webkit_initialized_(false) { 214 webkit_initialized_(false) {
215 const base::CommandLine& command_line = 215 const base::CommandLine& command_line =
216 *base::CommandLine::ForCurrentProcess(); 216 *base::CommandLine::ForCurrentProcess();
217 217
218 #if defined(ENABLE_AUTOFILL_DIALOG) 218 #if defined(ENABLE_AUTOFILL_DIALOG)
219 WebRuntimeFeatures::enableRequestAutocomplete(true); 219 WebRuntimeFeatures::enableRequestAutocomplete(true);
220 #endif 220 #endif
221 221
222 if (command_line.HasSwitch(switches::kEnableShowModalDialog))
223 WebRuntimeFeatures::enableShowModalDialog(true);
224
225 if (command_line.HasSwitch(switches::kDisableJavaScriptHarmonyShipping)) { 222 if (command_line.HasSwitch(switches::kDisableJavaScriptHarmonyShipping)) {
226 std::string flag("--noharmony-shipping"); 223 std::string flag("--noharmony-shipping");
227 v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size())); 224 v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size()));
228 } 225 }
229 226
230 if (command_line.HasSwitch(switches::kJavaScriptHarmony)) { 227 if (command_line.HasSwitch(switches::kJavaScriptHarmony)) {
231 std::string flag("--harmony"); 228 std::string flag("--harmony");
232 v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size())); 229 v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size()));
233 } 230 }
234 231
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 ChromeRenderProcessObserver::content_setting_rules() const { 331 ChromeRenderProcessObserver::content_setting_rules() const {
335 return &content_setting_rules_; 332 return &content_setting_rules_;
336 } 333 }
337 334
338 void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized( 335 void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized(
339 const std::string& trial_name, 336 const std::string& trial_name,
340 const std::string& group_name) { 337 const std::string& group_name) {
341 content::RenderThread::Get()->Send( 338 content::RenderThread::Get()->Send(
342 new ChromeViewHostMsg_FieldTrialActivated(trial_name)); 339 new ChromeViewHostMsg_FieldTrialActivated(trial_name));
343 } 340 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698