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

Side by Side Diff: chrome/app/chrome_dll_main.cc

Issue 375016: Use GetSwitchValuePath. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/browser_main.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // TODO(port): the ifdefs in here are a first step towards trying to determine 5 // TODO(port): the ifdefs in here are a first step towards trying to determine
6 // the correct abstraction for all the OS functionality required at this 6 // the correct abstraction for all the OS functionality required at this
7 // stage of process initialization. It should not be taken as a final 7 // stage of process initialization. It should not be taken as a final
8 // abstraction. 8 // abstraction.
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 // OS X enables sandboxing later in the startup process. 488 // OS X enables sandboxing later in the startup process.
489 #if !defined (OS_MACOSX) 489 #if !defined (OS_MACOSX)
490 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); 490 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type);
491 #endif // !OS_MACOSX 491 #endif // !OS_MACOSX
492 492
493 #if defined(OS_WIN) 493 #if defined(OS_WIN)
494 _Module.Init(NULL, instance); 494 _Module.Init(NULL, instance);
495 #endif 495 #endif
496 496
497 // Notice a user data directory override if any 497 // Notice a user data directory override if any
498 const FilePath user_data_dir = FilePath::FromWStringHack( 498 const FilePath user_data_dir =
499 parsed_command_line.GetSwitchValue(switches::kUserDataDir)); 499 parsed_command_line.GetSwitchValuePath(switches::kUserDataDir);
500 if (!user_data_dir.empty()) 500 if (!user_data_dir.empty())
501 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); 501 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir));
502 502
503 bool single_process = 503 bool single_process =
504 #if defined (GOOGLE_CHROME_BUILD) 504 #if defined (GOOGLE_CHROME_BUILD)
505 // This is an unsupported and not fully tested mode, so don't enable it for 505 // This is an unsupported and not fully tested mode, so don't enable it for
506 // official Chrome builds. 506 // official Chrome builds.
507 false; 507 false;
508 #else 508 #else
509 parsed_command_line.HasSwitch(switches::kSingleProcess); 509 parsed_command_line.HasSwitch(switches::kSingleProcess);
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 653
654 logging::CleanupChromeLogging(); 654 logging::CleanupChromeLogging();
655 655
656 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) 656 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
657 // TODO(mark): See the TODO(mark) above at InitCrashReporter. 657 // TODO(mark): See the TODO(mark) above at InitCrashReporter.
658 DestructCrashReporter(); 658 DestructCrashReporter();
659 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD 659 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD
660 660
661 return rv; 661 return rv;
662 } 662 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698