| OLD | NEW |
| 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/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 master_prefs_.reset(new first_run::MasterPrefs); | 856 master_prefs_.reset(new first_run::MasterPrefs); |
| 857 // Android doesn't use StartupBrowserCreator. | 857 // Android doesn't use StartupBrowserCreator. |
| 858 browser_creator_.reset(new StartupBrowserCreator); | 858 browser_creator_.reset(new StartupBrowserCreator); |
| 859 // TODO(yfriedman): Refactor Android to re-use UMABrowsingActivityObserver | 859 // TODO(yfriedman): Refactor Android to re-use UMABrowsingActivityObserver |
| 860 chrome::UMABrowsingActivityObserver::Init(); | 860 chrome::UMABrowsingActivityObserver::Init(); |
| 861 #endif | 861 #endif |
| 862 | 862 |
| 863 #if !defined(OS_CHROMEOS) | 863 #if !defined(OS_CHROMEOS) |
| 864 // Convert active labs into switches. This needs to be done before | 864 // Convert active labs into switches. This needs to be done before |
| 865 // ResourceBundle::InitSharedInstanceWithLocale as some loaded resources are | 865 // ResourceBundle::InitSharedInstanceWithLocale as some loaded resources are |
| 866 // affected by experiment flags (--touch-optimized-ui in particular). Not | 866 // affected by experiment flags (--touch-optimized-ui in particular). |
| 867 // needed on Android as there aren't experimental flags. | |
| 868 // On ChromeOS system level flags are applied from the device settings from | 867 // On ChromeOS system level flags are applied from the device settings from |
| 869 // the session manager. | 868 // the session manager. |
| 870 { | 869 { |
| 871 TRACE_EVENT0("startup", | 870 TRACE_EVENT0("startup", |
| 872 "ChromeBrowserMainParts::PreCreateThreadsImpl:ConvertFlags"); | 871 "ChromeBrowserMainParts::PreCreateThreadsImpl:ConvertFlags"); |
| 873 about_flags::PrefServiceFlagsStorage flags_storage_( | 872 about_flags::PrefServiceFlagsStorage flags_storage_( |
| 874 g_browser_process->local_state()); | 873 g_browser_process->local_state()); |
| 875 about_flags::ConvertFlagsToSwitches(&flags_storage_, | 874 about_flags::ConvertFlagsToSwitches(&flags_storage_, |
| 876 CommandLine::ForCurrentProcess(), | 875 CommandLine::ForCurrentProcess(), |
| 877 about_flags::kAddSentinels); | 876 about_flags::kAddSentinels); |
| (...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1720 chromeos::CrosSettings::Shutdown(); | 1719 chromeos::CrosSettings::Shutdown(); |
| 1721 #endif | 1720 #endif |
| 1722 #endif | 1721 #endif |
| 1723 } | 1722 } |
| 1724 | 1723 |
| 1725 // Public members: | 1724 // Public members: |
| 1726 | 1725 |
| 1727 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1726 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1728 chrome_extra_parts_.push_back(parts); | 1727 chrome_extra_parts_.push_back(parts); |
| 1729 } | 1728 } |
| OLD | NEW |