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

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

Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: nits Created 7 years, 11 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
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "chrome/browser/search_engines/template_url_service_factory.h" 84 #include "chrome/browser/search_engines/template_url_service_factory.h"
85 #include "chrome/browser/service/service_process_control.h" 85 #include "chrome/browser/service/service_process_control.h"
86 #include "chrome/browser/shell_integration.h" 86 #include "chrome/browser/shell_integration.h"
87 #include "chrome/browser/translate/translate_manager.h" 87 #include "chrome/browser/translate/translate_manager.h"
88 #include "chrome/browser/ui/browser.h" 88 #include "chrome/browser/ui/browser.h"
89 #include "chrome/browser/ui/browser_finder.h" 89 #include "chrome/browser/ui/browser_finder.h"
90 #include "chrome/browser/ui/startup/default_browser_prompt.h" 90 #include "chrome/browser/ui/startup/default_browser_prompt.h"
91 #include "chrome/browser/ui/startup/startup_browser_creator.h" 91 #include "chrome/browser/ui/startup/startup_browser_creator.h"
92 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 92 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
93 #include "chrome/browser/ui/user_data_dir_dialog.h" 93 #include "chrome/browser/ui/user_data_dir_dialog.h"
94 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
95 #include "chrome/common/child_process_logging.h" 94 #include "chrome/common/child_process_logging.h"
96 #include "chrome/common/chrome_constants.h" 95 #include "chrome/common/chrome_constants.h"
97 #include "chrome/common/chrome_paths.h" 96 #include "chrome/common/chrome_paths.h"
98 #include "chrome/common/chrome_result_codes.h" 97 #include "chrome/common/chrome_result_codes.h"
99 #include "chrome/common/chrome_switches.h" 98 #include "chrome/common/chrome_switches.h"
100 #include "chrome/common/env_vars.h" 99 #include "chrome/common/env_vars.h"
101 #include "chrome/common/jstemplate_builder.h" 100 #include "chrome/common/jstemplate_builder.h"
102 #include "chrome/common/logging_chrome.h" 101 #include "chrome/common/logging_chrome.h"
103 #include "chrome/common/metrics/variations/variations_util.h" 102 #include "chrome/common/metrics/variations/variations_util.h"
104 #include "chrome/common/net/net_resource_provider.h" 103 #include "chrome/common/net/net_resource_provider.h"
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 if (base::win::GetVersion() <= base::win::VERSION_XP) 1665 if (base::win::GetVersion() <= base::win::VERSION_XP)
1667 uma_name += "_XP"; 1666 uma_name += "_XP";
1668 1667
1669 uma_name += "_PreRead_"; 1668 uma_name += "_PreRead_";
1670 uma_name += pre_read_percentage; 1669 uma_name += pre_read_percentage;
1671 AddPreReadHistogramTime(uma_name.c_str(), time); 1670 AddPreReadHistogramTime(uma_name.c_str(), time);
1672 } 1671 }
1673 #endif 1672 #endif
1674 #endif 1673 #endif
1675 } 1674 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_private_api.cc » ('j') | chrome/browser/ui/webui/about_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698