diff options
26 files changed, 51 insertions, 23 deletions
diff --git a/chrome/app/DEPS b/chrome/app/DEPS index 8a59f4f..24aa874 100644 --- a/chrome/app/DEPS +++ b/chrome/app/DEPS @@ -11,6 +11,7 @@ include_rules = [ "+components/breakpad", "+components/nacl/common", "+components/nacl/zygote", + "+components/startup_metric_utils", "+content/public/app", "+content/public/browser/browser_main_runner.h", "+content/public/browser/render_process_host.h", diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc index 2b62047..919ffa8 100644 --- a/chrome/app/android/chrome_main_delegate_android.cc +++ b/chrome/app/android/chrome_main_delegate_android.cc @@ -9,7 +9,7 @@ #include "chrome/browser/android/chrome_jni_registrar.h" #include "chrome/browser/android/chrome_startup_flags.h" #include "chrome/browser/android/uma_utils.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_main_runner.h" // ChromeMainDelegateAndroid is created when the library is loaded. It is always diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 308132c..ddb3f78 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -27,12 +27,12 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/profiling.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" #include "chrome/plugin/chrome_content_plugin_client.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/utility/chrome_content_utility_client.h" #include "components/nacl/common/nacl_switches.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/common/content_client.h" #include "content/public/common/content_paths.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 6e3345c..0a4bcfd 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -13,6 +13,7 @@ include_rules = [ "+components/nacl/common", "+components/navigation_interception", "+components/policy", + "+components/startup_metric_utils", "+components/user_prefs", "+components/visitedlink/browser", "+components/webdata", diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 79a8528..47afba5 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -16,7 +16,7 @@ #include "chrome/browser/bookmarks/bookmark_index.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 7265e746..8f70eff 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -115,8 +115,8 @@ #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 2d0a040..6a57a5d 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -86,8 +86,8 @@ #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/sync_helper.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc index 51f942a..550d037 100644 --- a/chrome/browser/first_run/first_run_internal_posix.cc +++ b/chrome/browser/first_run/first_run_internal_posix.cc @@ -14,9 +14,9 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/master_preferences.h" +#include "components/startup_metric_utils/startup_metric_utils.h" namespace first_run { namespace internal { diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 1ad2bcf..d66a66f 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -80,9 +80,9 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "components/user_prefs/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 0e8e732..8caf7f3 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -56,8 +56,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc index ac606f2..75b5a99 100644 --- a/chrome/browser/safe_browsing/database_manager.cc +++ b/chrome/browser/safe_browsing/database_manager.cc @@ -30,8 +30,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 5ae4201..6d3604d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -34,8 +34,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cookie_store_factory.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index dd97f43..8af2138 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -33,7 +33,7 @@ #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 9c12887..2056b53 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -148,8 +148,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" #include "chrome/common/search_types.h" -#include "chrome/common/startup_metric_utils.h" #include "chrome/common/url_constants.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/ui/cocoa/simple_message_box_mac.mm b/chrome/browser/ui/cocoa/simple_message_box_mac.mm index 088e493..cc956ee 100644 --- a/chrome/browser/ui/cocoa/simple_message_box_mac.mm +++ b/chrome/browser/ui/cocoa/simple_message_box_mac.mm @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/strings/sys_string_conversions.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/startup/default_browser_prompt_win.cc b/chrome/browser/ui/startup/default_browser_prompt_win.cc index f23e14d..c7843e2 100644 --- a/chrome/browser/ui/startup/default_browser_prompt_win.cc +++ b/chrome/browser/ui/startup/default_browser_prompt_win.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/webui/set_as_default_browser_ui.h" #include "chrome/common/pref_names.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/ui/views/simple_message_box_win.cc b/chrome/browser/ui/views/simple_message_box_win.cc index 70ab8a8..a0eef7d 100644 --- a/chrome/browser/ui/views/simple_message_box_win.cc +++ b/chrome/browser/ui/views/simple_message_box_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/simple_message_box.h" -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "ui/base/win/hwnd_util.h" #include "ui/base/win/message_box_win.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5c2b01c..8efbbc6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -29,6 +29,7 @@ '../components/components.gyp:browser_context_keyed_service', '../components/components.gyp:encryptor', '../components/components.gyp:sessions', + '../components/components.gyp:startup_metric_utils', '../components/components.gyp:user_prefs', # The direct variations_seed_proto dependency is needed, rather than # using common's dependency on variations, because the proto sources diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3d0b3c8..7e4af84 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -452,8 +452,6 @@ 'common/spellcheck_marker.h', 'common/spellcheck_messages.h', 'common/spellcheck_result.h', - 'common/startup_metric_utils.cc', - 'common/startup_metric_utils.h', 'common/switch_utils.cc', 'common/switch_utils.h', 'common/thumbnail_score.cc', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 786a72d..a4949ee 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -14,6 +14,7 @@ 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', '../components/components.gyp:autofill_content_renderer', + '../components/components.gyp:startup_metric_utils', '../components/components.gyp:visitedlink_renderer', '../content/content.gyp:content_renderer', '../net/net.gyp:net', diff --git a/components/OWNERS b/components/OWNERS index 52618de..2c71d95 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -37,6 +37,8 @@ per-file sessions.gypi=sky@chromium.org per-file tracing*=jbauman@chromium.org per-file tracing*=nduca@chromium.org +per-file startup_metric_utils.gypi=jeremy@chromium.org + per-file user_prefs.gypi=battre@chromium.org per-file user_prefs.gypi=bauerb@chromium.org per-file user_prefs.gypi=mnissler@chromium.org diff --git a/components/components.gyp b/components/components.gyp index f3be9de..02f190b 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -19,6 +19,7 @@ 'navigation_interception.gypi', 'policy.gypi', 'sessions.gypi', + 'startup_metric_utils.gypi', 'user_prefs.gypi', 'variations.gypi', 'visitedlink.gypi', diff --git a/components/startup_metric_utils.gypi b/components/startup_metric_utils.gypi new file mode 100644 index 0000000..55763c8 --- /dev/null +++ b/components/startup_metric_utils.gypi @@ -0,0 +1,22 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'startup_metric_utils', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'startup_metric_utils/startup_metric_utils.cc', + 'startup_metric_utils/startup_metric_utils.h', + ], + }, + ], +} diff --git a/components/startup_metric_utils/OWNERS b/components/startup_metric_utils/OWNERS new file mode 100644 index 0000000..b112a84 --- /dev/null +++ b/components/startup_metric_utils/OWNERS @@ -0,0 +1 @@ +jeremy@chromium.org
\ No newline at end of file diff --git a/chrome/common/startup_metric_utils.cc b/components/startup_metric_utils/startup_metric_utils.cc index 681b704..b2ac1bc 100644 --- a/chrome/common/startup_metric_utils.cc +++ b/components/startup_metric_utils/startup_metric_utils.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/startup_metric_utils.h" +#include "components/startup_metric_utils/startup_metric_utils.h" #include "base/containers/hash_tables.h" #include "base/logging.h" diff --git a/chrome/common/startup_metric_utils.h b/components/startup_metric_utils/startup_metric_utils.h index 879fbcb..594ad15 100644 --- a/chrome/common/startup_metric_utils.h +++ b/components/startup_metric_utils/startup_metric_utils.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_STARTUP_METRIC_UTILS_H_ -#define CHROME_COMMON_STARTUP_METRIC_UTILS_H_ +#ifndef COMPONENTS_STARTUP_METRIC_UTILS_STARTUP_METRIC_UTILS_H_ +#define COMPONENTS_STARTUP_METRIC_UTILS_STARTUP_METRIC_UTILS_H_ #include <string> @@ -67,4 +67,4 @@ class ScopedSlowStartupUMA { } // namespace startup_metric_utils -#endif // CHROME_COMMON_STARTUP_METRIC_UTILS_H_ +#endif // COMPONENTS_STARTUP_METRIC_UTILS_STARTUP_METRIC_UTILS_H_ |