OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/login/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 if (CrosLibrary::Get()->EnsureLoaded()) { | 359 if (CrosLibrary::Get()->EnsureLoaded()) { |
360 // For guest session we ask session manager to restart Chrome with --bwsi | 360 // For guest session we ask session manager to restart Chrome with --bwsi |
361 // flag. We keep only some of the arguments of this process. | 361 // flag. We keep only some of the arguments of this process. |
362 static const char* kForwardSwitches[] = { | 362 static const char* kForwardSwitches[] = { |
363 switches::kEnableLogging, | 363 switches::kEnableLogging, |
364 switches::kUserDataDir, | 364 switches::kUserDataDir, |
365 switches::kScrollPixels, | 365 switches::kScrollPixels, |
366 switches::kEnableGView, | 366 switches::kEnableGView, |
367 switches::kNoFirstRun, | 367 switches::kNoFirstRun, |
368 switches::kLoginProfile, | 368 switches::kLoginProfile, |
369 switches::kEnableTabbedOptions, | |
370 switches::kCompressSystemFeedback, | 369 switches::kCompressSystemFeedback, |
371 switches::kDisableSeccompSandbox, | 370 switches::kDisableSeccompSandbox, |
372 #if defined(HAVE_XINPUT2) | 371 #if defined(HAVE_XINPUT2) |
373 switches::kTouchDevices, | 372 switches::kTouchDevices, |
374 #endif | 373 #endif |
375 }; | 374 }; |
376 const CommandLine& browser_command_line = | 375 const CommandLine& browser_command_line = |
377 *CommandLine::ForCurrentProcess(); | 376 *CommandLine::ForCurrentProcess(); |
378 CommandLine command_line(browser_command_line.GetProgram()); | 377 CommandLine command_line(browser_command_line.GetProgram()); |
379 command_line.CopySwitchesFrom(browser_command_line, | 378 command_line.CopySwitchesFrom(browser_command_line, |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 BrowserInit browser_init; | 526 BrowserInit browser_init; |
528 int return_code; | 527 int return_code; |
529 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 528 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
530 profile, | 529 profile, |
531 FilePath(), | 530 FilePath(), |
532 true, | 531 true, |
533 &return_code); | 532 &return_code); |
534 } | 533 } |
535 | 534 |
536 } // namespace chromeos | 535 } // namespace chromeos |
OLD | NEW |