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

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

Issue 11027017: Move ManagedMode classes to chrome/browser/managed_mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/managed_mode/managed_mode_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/chrome_gpu_util.h" 38 #include "chrome/browser/chrome_gpu_util.h"
39 #include "chrome/browser/defaults.h" 39 #include "chrome/browser/defaults.h"
40 #include "chrome/browser/extensions/extension_protocols.h" 40 #include "chrome/browser/extensions/extension_protocols.h"
41 #include "chrome/browser/extensions/extension_service.h" 41 #include "chrome/browser/extensions/extension_service.h"
42 #include "chrome/browser/extensions/startup_helper.h" 42 #include "chrome/browser/extensions/startup_helper.h"
43 #include "chrome/browser/first_run/upgrade_util.h" 43 #include "chrome/browser/first_run/upgrade_util.h"
44 #include "chrome/browser/google/google_search_counter.h" 44 #include "chrome/browser/google/google_search_counter.h"
45 #include "chrome/browser/google/google_util.h" 45 #include "chrome/browser/google/google_util.h"
46 #include "chrome/browser/jankometer.h" 46 #include "chrome/browser/jankometer.h"
47 #include "chrome/browser/language_usage_metrics.h" 47 #include "chrome/browser/language_usage_metrics.h"
48 #include "chrome/browser/managed_mode.h" 48 #include "chrome/browser/managed_mode/managed_mode.h"
49 #include "chrome/browser/metrics/field_trial_synchronizer.h" 49 #include "chrome/browser/metrics/field_trial_synchronizer.h"
50 #include "chrome/browser/metrics/metrics_log.h" 50 #include "chrome/browser/metrics/metrics_log.h"
51 #include "chrome/browser/metrics/metrics_service.h" 51 #include "chrome/browser/metrics/metrics_service.h"
52 #include "chrome/browser/metrics/thread_watcher.h" 52 #include "chrome/browser/metrics/thread_watcher.h"
53 #include "chrome/browser/metrics/tracking_synchronizer.h" 53 #include "chrome/browser/metrics/tracking_synchronizer.h"
54 #include "chrome/browser/metrics/variations/variations_service.h" 54 #include "chrome/browser/metrics/variations/variations_service.h"
55 #include "chrome/browser/nacl_host/nacl_process_host.h" 55 #include "chrome/browser/nacl_host/nacl_process_host.h"
56 #include "chrome/browser/net/chrome_net_log.h" 56 #include "chrome/browser/net/chrome_net_log.h"
57 #include "chrome/browser/notifications/desktop_notification_service.h" 57 #include "chrome/browser/notifications/desktop_notification_service.h"
58 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 58 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 if (base::win::GetVersion() <= base::win::VERSION_XP) 1656 if (base::win::GetVersion() <= base::win::VERSION_XP)
1657 uma_name += "_XP"; 1657 uma_name += "_XP";
1658 1658
1659 uma_name += "_PreRead_"; 1659 uma_name += "_PreRead_";
1660 uma_name += pre_read_percentage; 1660 uma_name += pre_read_percentage;
1661 AddPreReadHistogramTime(uma_name.c_str(), time); 1661 AddPreReadHistogramTime(uma_name.c_str(), time);
1662 } 1662 }
1663 #endif 1663 #endif
1664 #endif 1664 #endif
1665 } 1665 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/managed_mode/managed_mode_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698