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

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

Issue 1413153010: Move components/startup_metric_utils/* to components/startup_metric_utils/browser/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/common/logging_chrome.h" 33 #include "chrome/common/logging_chrome.h"
34 #include "chrome/common/profiling.h" 34 #include "chrome/common/profiling.h"
35 #include "chrome/common/switch_utils.h" 35 #include "chrome/common/switch_utils.h"
36 #include "chrome/common/trace_event_args_whitelist.h" 36 #include "chrome/common/trace_event_args_whitelist.h"
37 #include "chrome/common/url_constants.h" 37 #include "chrome/common/url_constants.h"
38 #include "chrome/plugin/chrome_content_plugin_client.h" 38 #include "chrome/plugin/chrome_content_plugin_client.h"
39 #include "chrome/renderer/chrome_content_renderer_client.h" 39 #include "chrome/renderer/chrome_content_renderer_client.h"
40 #include "chrome/utility/chrome_content_utility_client.h" 40 #include "chrome/utility/chrome_content_utility_client.h"
41 #include "components/component_updater/component_updater_paths.h" 41 #include "components/component_updater/component_updater_paths.h"
42 #include "components/content_settings/core/common/content_settings_pattern.h" 42 #include "components/content_settings/core/common/content_settings_pattern.h"
43 #include "components/startup_metric_utils/startup_metric_utils.h" 43 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
44 #include "components/version_info/version_info.h" 44 #include "components/version_info/version_info.h"
45 #include "content/public/common/content_client.h" 45 #include "content/public/common/content_client.h"
46 #include "content/public/common/content_paths.h" 46 #include "content/public/common/content_paths.h"
47 #include "content/public/common/content_switches.h" 47 #include "content/public/common/content_switches.h"
48 #include "extensions/common/constants.h" 48 #include "extensions/common/constants.h"
49 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
50 #include "ui/base/ui_base_switches.h" 50 #include "ui/base/ui_base_switches.h"
51 51
52 #if defined(OS_WIN) 52 #if defined(OS_WIN)
53 #include <atlbase.h> 53 #include <atlbase.h>
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 case version_info::Channel::CANARY: 965 case version_info::Channel::CANARY:
966 return true; 966 return true;
967 case version_info::Channel::DEV: 967 case version_info::Channel::DEV:
968 case version_info::Channel::BETA: 968 case version_info::Channel::BETA:
969 case version_info::Channel::STABLE: 969 case version_info::Channel::STABLE:
970 default: 970 default:
971 // Don't enable instrumentation. 971 // Don't enable instrumentation.
972 return false; 972 return false;
973 } 973 }
974 } 974 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698