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

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

Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_plugin_group
Patch Set: . Created 8 years, 3 months 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/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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/metrics/thread_watcher.h" 51 #include "chrome/browser/metrics/thread_watcher.h"
52 #include "chrome/browser/metrics/tracking_synchronizer.h" 52 #include "chrome/browser/metrics/tracking_synchronizer.h"
53 #include "chrome/browser/metrics/variations/variations_service.h" 53 #include "chrome/browser/metrics/variations/variations_service.h"
54 #include "chrome/browser/nacl_host/nacl_process_host.h" 54 #include "chrome/browser/nacl_host/nacl_process_host.h"
55 #include "chrome/browser/net/chrome_net_log.h" 55 #include "chrome/browser/net/chrome_net_log.h"
56 #include "chrome/browser/notifications/desktop_notification_service.h" 56 #include "chrome/browser/notifications/desktop_notification_service.h"
57 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 57 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
58 #include "chrome/browser/page_cycler/page_cycler.h" 58 #include "chrome/browser/page_cycler/page_cycler.h"
59 #include "chrome/browser/performance_monitor/performance_monitor.h" 59 #include "chrome/browser/performance_monitor/performance_monitor.h"
60 #include "chrome/browser/performance_monitor/startup_timer.h" 60 #include "chrome/browser/performance_monitor/startup_timer.h"
61 #include "chrome/browser/plugin_prefs.h" 61 #include "chrome/browser/plugins/plugin_prefs.h"
62 #include "chrome/browser/policy/policy_service.h" 62 #include "chrome/browser/policy/policy_service.h"
63 #include "chrome/browser/prefs/pref_service.h" 63 #include "chrome/browser/prefs/pref_service.h"
64 #include "chrome/browser/prefs/pref_value_store.h" 64 #include "chrome/browser/prefs/pref_value_store.h"
65 #include "chrome/browser/prefs/scoped_user_pref_update.h" 65 #include "chrome/browser/prefs/scoped_user_pref_update.h"
66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
67 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 67 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
68 #include "chrome/browser/process_singleton.h" 68 #include "chrome/browser/process_singleton.h"
69 #include "chrome/browser/profiles/profile.h" 69 #include "chrome/browser/profiles/profile.h"
70 #include "chrome/browser/profiles/profile_manager.h" 70 #include "chrome/browser/profiles/profile_manager.h"
71 #include "chrome/browser/search_engines/search_engine_type.h" 71 #include "chrome/browser/search_engines/search_engine_type.h"
(...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 if (base::win::GetVersion() <= base::win::VERSION_XP) 1616 if (base::win::GetVersion() <= base::win::VERSION_XP)
1617 uma_name += "_XP"; 1617 uma_name += "_XP";
1618 1618
1619 uma_name += "_PreRead_"; 1619 uma_name += "_PreRead_";
1620 uma_name += pre_read_percentage; 1620 uma_name += pre_read_percentage;
1621 AddPreReadHistogramTime(uma_name.c_str(), time); 1621 AddPreReadHistogramTime(uma_name.c_str(), time);
1622 } 1622 }
1623 #endif 1623 #endif
1624 #endif 1624 #endif
1625 } 1625 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/chrome_plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698