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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2654993002: Remove --allow-file-access and accompanying logic (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 // This forces the ProfileManager to be created and register for the 473 // This forces the ProfileManager to be created and register for the
474 // notification it needs to track the logged in user. 474 // notification it needs to track the logged in user.
475 g_browser_process->profile_manager(); 475 g_browser_process->profile_manager();
476 476
477 // AccessibilityManager and SystemKeyEventListener use InputMethodManager. 477 // AccessibilityManager and SystemKeyEventListener use InputMethodManager.
478 input_method::Initialize(); 478 input_method::Initialize();
479 479
480 // ProfileHelper has to be initialized after UserManager instance is created. 480 // ProfileHelper has to be initialized after UserManager instance is created.
481 ProfileHelper::Get()->Initialize(); 481 ProfileHelper::Get()->Initialize();
482 482
483 // TODO(abarth): Should this move to InitializeNetworkOptions()?
484 // Allow access to file:// on ChromeOS for tests.
485 if (parsed_command_line().HasSwitch(::switches::kAllowFileAccess))
486 ChromeNetworkDelegate::AllowAccessToAllFiles();
487
488 // If kLoginUser is passed this indicates that user has already 483 // If kLoginUser is passed this indicates that user has already
489 // logged in and we should behave accordingly. 484 // logged in and we should behave accordingly.
490 bool immediate_login = 485 bool immediate_login =
491 parsed_command_line().HasSwitch(switches::kLoginUser); 486 parsed_command_line().HasSwitch(switches::kLoginUser);
492 if (immediate_login) { 487 if (immediate_login) {
493 // Redirects Chrome logging to the user data dir. 488 // Redirects Chrome logging to the user data dir.
494 logging::RedirectChromeLogging(parsed_command_line()); 489 logging::RedirectChromeLogging(parsed_command_line());
495 490
496 // Load the default app order synchronously for restarting case. 491 // Load the default app order synchronously for restarting case.
497 app_order_loader_.reset( 492 app_order_loader_.reset(
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 941
947 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 942 ChromeBrowserMainPartsLinux::PostDestroyThreads();
948 943
949 // Destroy DeviceSettingsService after g_browser_process. 944 // Destroy DeviceSettingsService after g_browser_process.
950 DeviceSettingsService::Shutdown(); 945 DeviceSettingsService::Shutdown();
951 946
952 chromeos::ShutdownCloseTracking(); 947 chromeos::ShutdownCloseTracking();
953 } 948 }
954 949
955 } // namespace chromeos 950 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698