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

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

Issue 12319119: Fix layering violation in content\browser\renderer_host. That directory shouldn't be including web_… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « chrome/browser/chrome_browser_main.h ('k') | chrome/browser/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 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 #include "chrome/browser/process_singleton.h" 85 #include "chrome/browser/process_singleton.h"
86 #include "chrome/browser/profiles/profile.h" 86 #include "chrome/browser/profiles/profile.h"
87 #include "chrome/browser/profiles/profile_manager.h" 87 #include "chrome/browser/profiles/profile_manager.h"
88 #include "chrome/browser/search_engines/search_engine_type.h" 88 #include "chrome/browser/search_engines/search_engine_type.h"
89 #include "chrome/browser/search_engines/template_url.h" 89 #include "chrome/browser/search_engines/template_url.h"
90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
91 #include "chrome/browser/search_engines/template_url_service.h" 91 #include "chrome/browser/search_engines/template_url_service.h"
92 #include "chrome/browser/search_engines/template_url_service_factory.h" 92 #include "chrome/browser/search_engines/template_url_service_factory.h"
93 #include "chrome/browser/service/service_process_control.h" 93 #include "chrome/browser/service/service_process_control.h"
94 #include "chrome/browser/shell_integration.h" 94 #include "chrome/browser/shell_integration.h"
95 #include "chrome/browser/three_d_api_observer.h"
95 #include "chrome/browser/translate/translate_manager.h" 96 #include "chrome/browser/translate/translate_manager.h"
96 #include "chrome/browser/ui/app_list/app_list_util.h" 97 #include "chrome/browser/ui/app_list/app_list_util.h"
97 #include "chrome/browser/ui/browser.h" 98 #include "chrome/browser/ui/browser.h"
98 #include "chrome/browser/ui/browser_finder.h" 99 #include "chrome/browser/ui/browser_finder.h"
99 #include "chrome/browser/ui/host_desktop.h" 100 #include "chrome/browser/ui/host_desktop.h"
100 #include "chrome/browser/ui/startup/default_browser_prompt.h" 101 #include "chrome/browser/ui/startup/default_browser_prompt.h"
101 #include "chrome/browser/ui/startup/startup_browser_creator.h" 102 #include "chrome/browser/ui/startup/startup_browser_creator.h"
102 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 103 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
103 #include "chrome/browser/ui/user_data_dir_dialog.h" 104 #include "chrome/browser/ui/user_data_dir_dialog.h"
104 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 105 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1039 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1039 chrome_extra_parts_[i]->PostProfileInit(); 1040 chrome_extra_parts_[i]->PostProfileInit();
1040 } 1041 }
1041 1042
1042 void ChromeBrowserMainParts::PreBrowserStart() { 1043 void ChromeBrowserMainParts::PreBrowserStart() {
1043 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1044 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1044 chrome_extra_parts_[i]->PreBrowserStart(); 1045 chrome_extra_parts_[i]->PreBrowserStart();
1045 #if !defined(OS_ANDROID) 1046 #if !defined(OS_ANDROID)
1046 gpu_util::InstallBrowserMonitor(); 1047 gpu_util::InstallBrowserMonitor();
1047 #endif 1048 #endif
1049
1050 three_d_observer_.reset(new ThreeDAPIObserver());
1048 } 1051 }
1049 1052
1050 void ChromeBrowserMainParts::PostBrowserStart() { 1053 void ChromeBrowserMainParts::PostBrowserStart() {
1051 #if !defined(OS_ANDROID) 1054 #if !defined(OS_ANDROID)
1052 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) 1055 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs))
1053 RunPageCycler(); 1056 RunPageCycler();
1054 #endif 1057 #endif
1055 1058
1056 // Create the instance of the Google Now service. 1059 // Create the instance of the Google Now service.
1057 #if defined(ENABLE_GOOGLE_NOW) 1060 #if defined(ENABLE_GOOGLE_NOW)
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 if (base::win::GetVersion() <= base::win::VERSION_XP) 1800 if (base::win::GetVersion() <= base::win::VERSION_XP)
1798 uma_name += "_XP"; 1801 uma_name += "_XP";
1799 1802
1800 uma_name += "_PreRead_"; 1803 uma_name += "_PreRead_";
1801 uma_name += pre_read_percentage; 1804 uma_name += pre_read_percentage;
1802 AddPreReadHistogramTime(uma_name.c_str(), time); 1805 AddPreReadHistogramTime(uma_name.c_str(), time);
1803 } 1806 }
1804 #endif 1807 #endif
1805 #endif 1808 #endif
1806 } 1809 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.h ('k') | chrome/browser/three_d_api_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698