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

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

Issue 277623003: Move ThreeDAPIObserver from chrome/browser to chrome/browser/gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/gpu/three_d_api_observer.h » ('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 <set> 7 #include <set>
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/component_updater/widevine_cdm_component_installer.h" 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
52 #include "chrome/browser/defaults.h" 52 #include "chrome/browser/defaults.h"
53 #include "chrome/browser/extensions/extension_service.h" 53 #include "chrome/browser/extensions/extension_service.h"
54 #include "chrome/browser/extensions/startup_helper.h" 54 #include "chrome/browser/extensions/startup_helper.h"
55 #include "chrome/browser/feedback/feedback_profile_observer.h" 55 #include "chrome/browser/feedback/feedback_profile_observer.h"
56 #include "chrome/browser/first_run/first_run.h" 56 #include "chrome/browser/first_run/first_run.h"
57 #include "chrome/browser/first_run/upgrade_util.h" 57 #include "chrome/browser/first_run/upgrade_util.h"
58 #include "chrome/browser/google/google_search_counter.h" 58 #include "chrome/browser/google/google_search_counter.h"
59 #include "chrome/browser/google/google_util.h" 59 #include "chrome/browser/google/google_util.h"
60 #include "chrome/browser/gpu/gl_string_manager.h" 60 #include "chrome/browser/gpu/gl_string_manager.h"
61 #include "chrome/browser/gpu/three_d_api_observer.h"
61 #include "chrome/browser/jankometer.h" 62 #include "chrome/browser/jankometer.h"
62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 63 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
63 #include "chrome/browser/metrics/field_trial_synchronizer.h" 64 #include "chrome/browser/metrics/field_trial_synchronizer.h"
64 #include "chrome/browser/metrics/metrics_log.h" 65 #include "chrome/browser/metrics/metrics_log.h"
65 #include "chrome/browser/metrics/metrics_service.h" 66 #include "chrome/browser/metrics/metrics_service.h"
66 #include "chrome/browser/metrics/thread_watcher.h" 67 #include "chrome/browser/metrics/thread_watcher.h"
67 #include "chrome/browser/metrics/tracking_synchronizer.h" 68 #include "chrome/browser/metrics/tracking_synchronizer.h"
68 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" 69 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
69 #include "chrome/browser/metrics/variations/variations_service.h" 70 #include "chrome/browser/metrics/variations/variations_service.h"
70 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 71 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
71 #include "chrome/browser/net/chrome_net_log.h" 72 #include "chrome/browser/net/chrome_net_log.h"
72 #include "chrome/browser/net/crl_set_fetcher.h" 73 #include "chrome/browser/net/crl_set_fetcher.h"
73 #include "chrome/browser/notifications/desktop_notification_service.h" 74 #include "chrome/browser/notifications/desktop_notification_service.h"
74 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 75 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
75 #include "chrome/browser/performance_monitor/performance_monitor.h" 76 #include "chrome/browser/performance_monitor/performance_monitor.h"
76 #include "chrome/browser/performance_monitor/startup_timer.h" 77 #include "chrome/browser/performance_monitor/startup_timer.h"
77 #include "chrome/browser/plugins/plugin_prefs.h" 78 #include "chrome/browser/plugins/plugin_prefs.h"
78 #include "chrome/browser/pref_service_flags_storage.h" 79 #include "chrome/browser/pref_service_flags_storage.h"
79 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 80 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
80 #include "chrome/browser/prefs/command_line_pref_store.h" 81 #include "chrome/browser/prefs/command_line_pref_store.h"
81 #include "chrome/browser/prefs/pref_metrics_service.h" 82 #include "chrome/browser/prefs/pref_metrics_service.h"
82 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 83 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
83 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 84 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
84 #include "chrome/browser/process_singleton.h" 85 #include "chrome/browser/process_singleton.h"
85 #include "chrome/browser/profiles/profile.h" 86 #include "chrome/browser/profiles/profile.h"
86 #include "chrome/browser/profiles/profile_manager.h" 87 #include "chrome/browser/profiles/profile_manager.h"
87 #include "chrome/browser/profiles/profiles_state.h" 88 #include "chrome/browser/profiles/profiles_state.h"
88 #include "chrome/browser/shell_integration.h" 89 #include "chrome/browser/shell_integration.h"
89 #include "chrome/browser/three_d_api_observer.h"
90 #include "chrome/browser/translate/translate_service.h" 90 #include "chrome/browser/translate/translate_service.h"
91 #include "chrome/browser/ui/app_list/app_list_service.h" 91 #include "chrome/browser/ui/app_list/app_list_service.h"
92 #include "chrome/browser/ui/browser.h" 92 #include "chrome/browser/ui/browser.h"
93 #include "chrome/browser/ui/browser_finder.h" 93 #include "chrome/browser/ui/browser_finder.h"
94 #include "chrome/browser/ui/host_desktop.h" 94 #include "chrome/browser/ui/host_desktop.h"
95 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 95 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
96 #include "chrome/browser/ui/startup/default_browser_prompt.h" 96 #include "chrome/browser/ui/startup/default_browser_prompt.h"
97 #include "chrome/browser/ui/startup/startup_browser_creator.h" 97 #include "chrome/browser/ui/startup/startup_browser_creator.h"
98 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 98 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
99 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 99 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
(...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 chromeos::CrosSettings::Shutdown(); 1652 chromeos::CrosSettings::Shutdown();
1653 #endif 1653 #endif
1654 #endif 1654 #endif
1655 } 1655 }
1656 1656
1657 // Public members: 1657 // Public members:
1658 1658
1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1660 chrome_extra_parts_.push_back(parts); 1660 chrome_extra_parts_.push_back(parts);
1661 } 1661 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gpu/three_d_api_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698