| 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 |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/at_exit.h" | 14 #include "base/at_exit.h" |
| 15 #include "base/bind.h" | 15 #include "base/bind.h" |
| 16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 17 #include "base/debug/debugger.h" | 17 #include "base/debug/debugger.h" |
| 18 #include "base/debug/trace_event.h" | 18 #include "base/debug/trace_event.h" |
| 19 #include "base/file_util.h" | 19 #include "base/file_util.h" |
| 20 #include "base/files/file_path.h" | 20 #include "base/files/file_path.h" |
| 21 #include "base/metrics/field_trial.h" | 21 #include "base/metrics/field_trial.h" |
| 22 #include "base/metrics/histogram.h" | 22 #include "base/metrics/histogram.h" |
| 23 #include "base/path_service.h" | 23 #include "base/path_service.h" |
| 24 #include "base/prefs/json_pref_store.h" | 24 #include "base/prefs/json_pref_store.h" |
| 25 #include "base/prefs/pref_registry_simple.h" | 25 #include "base/prefs/pref_registry_simple.h" |
| 26 #include "base/prefs/pref_service.h" | 26 #include "base/prefs/pref_service.h" |
| 27 #include "base/prefs/pref_value_store.h" | 27 #include "base/prefs/pref_value_store.h" |
| 28 #include "base/process_info.h" | 28 #include "base/process/process_info.h" |
| 29 #include "base/process_util.h" | |
| 30 #include "base/run_loop.h" | 29 #include "base/run_loop.h" |
| 31 #include "base/strings/string_number_conversions.h" | 30 #include "base/strings/string_number_conversions.h" |
| 32 #include "base/strings/string_piece.h" | 31 #include "base/strings/string_piece.h" |
| 33 #include "base/strings/string_split.h" | 32 #include "base/strings/string_split.h" |
| 34 #include "base/strings/sys_string_conversions.h" | 33 #include "base/strings/sys_string_conversions.h" |
| 35 #include "base/strings/utf_string_conversions.h" | 34 #include "base/strings/utf_string_conversions.h" |
| 36 #include "base/sys_info.h" | 35 #include "base/sys_info.h" |
| 37 #include "base/threading/platform_thread.h" | 36 #include "base/threading/platform_thread.h" |
| 38 #include "base/time/time.h" | 37 #include "base/time/time.h" |
| 39 #include "base/values.h" | 38 #include "base/values.h" |
| (...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1730 chromeos::CrosSettings::Shutdown(); | 1729 chromeos::CrosSettings::Shutdown(); |
| 1731 #endif | 1730 #endif |
| 1732 #endif | 1731 #endif |
| 1733 } | 1732 } |
| 1734 | 1733 |
| 1735 // Public members: | 1734 // Public members: |
| 1736 | 1735 |
| 1737 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1736 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1738 chrome_extra_parts_.push_back(parts); | 1737 chrome_extra_parts_.push_back(parts); |
| 1739 } | 1738 } |
| OLD | NEW |