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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 341044: Move chromeos code to namespace chromeos. (Closed) Base URL: svn://chrome-svn/chrome/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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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 #include "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 HandleErrorTestParameters(parsed_command_line); 847 HandleErrorTestParameters(parsed_command_line);
848 Platform::RecordBreakpadStatusUMA(metrics); 848 Platform::RecordBreakpadStatusUMA(metrics);
849 // Start up the extensions service. This should happen before Start(). 849 // Start up the extensions service. This should happen before Start().
850 profile->InitExtensions(); 850 profile->InitExtensions();
851 // Start up the web resource service. This starts loading data after a 851 // Start up the web resource service. This starts loading data after a
852 // short delay so as not to interfere with startup time. 852 // short delay so as not to interfere with startup time.
853 if (!parsed_command_line.HasSwitch(switches::kDisableWebResources)) 853 if (!parsed_command_line.HasSwitch(switches::kDisableWebResources))
854 profile->InitWebResources(); 854 profile->InitWebResources();
855 855
856 #if defined(OS_CHROMEOS) 856 #if defined(OS_CHROMEOS)
857 ExternalCookieHandler::GetCookies(parsed_command_line, profile); 857 chromeos::ExternalCookieHandler::GetCookies(parsed_command_line, profile);
858 #endif 858 #endif
859 859
860 // Stat the directory with the inspector's files so that we can know if we 860 // Stat the directory with the inspector's files so that we can know if we
861 // should display the entry in the context menu or not. 861 // should display the entry in the context menu or not.
862 browser_process->CheckForInspectorFiles(); 862 browser_process->CheckForInspectorFiles();
863 863
864 int result_code = ResultCodes::NORMAL_EXIT; 864 int result_code = ResultCodes::NORMAL_EXIT;
865 if (parameters.ui_task) { 865 if (parameters.ui_task) {
866 // We are in test mode. Run one task and enter the main message loop. 866 // We are in test mode. Run one task and enter the main message loop.
867 if (pool) 867 if (pool)
(...skipping 20 matching lines...) Expand all
888 if (metrics) 888 if (metrics)
889 metrics->Stop(); 889 metrics->Stop();
890 890
891 // browser_shutdown takes care of deleting browser_process, so we need to 891 // browser_shutdown takes care of deleting browser_process, so we need to
892 // release it. 892 // release it.
893 browser_process.release(); 893 browser_process.release();
894 browser_shutdown::Shutdown(); 894 browser_shutdown::Shutdown();
895 895
896 return result_code; 896 return result_code;
897 } 897 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698