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

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

Issue 12321107: Move shell integration code from chrome/browser to apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "apps/shell_integration.h"
14 #include "base/at_exit.h" 15 #include "base/at_exit.h"
15 #include "base/bind.h" 16 #include "base/bind.h"
16 #include "base/command_line.h" 17 #include "base/command_line.h"
17 #include "base/cpu.h" 18 #include "base/cpu.h"
18 #include "base/debug/trace_event.h" 19 #include "base/debug/trace_event.h"
19 #include "base/file_util.h" 20 #include "base/file_util.h"
20 #include "base/files/file_path.h" 21 #include "base/files/file_path.h"
21 #include "base/metrics/field_trial.h" 22 #include "base/metrics/field_trial.h"
22 #include "base/metrics/histogram.h" 23 #include "base/metrics/histogram.h"
23 #include "base/path_service.h" 24 #include "base/path_service.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 85 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
85 #include "chrome/browser/process_singleton.h" 86 #include "chrome/browser/process_singleton.h"
86 #include "chrome/browser/profiles/profile.h" 87 #include "chrome/browser/profiles/profile.h"
87 #include "chrome/browser/profiles/profile_manager.h" 88 #include "chrome/browser/profiles/profile_manager.h"
88 #include "chrome/browser/search_engines/search_engine_type.h" 89 #include "chrome/browser/search_engines/search_engine_type.h"
89 #include "chrome/browser/search_engines/template_url.h" 90 #include "chrome/browser/search_engines/template_url.h"
90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 91 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
91 #include "chrome/browser/search_engines/template_url_service.h" 92 #include "chrome/browser/search_engines/template_url_service.h"
92 #include "chrome/browser/search_engines/template_url_service_factory.h" 93 #include "chrome/browser/search_engines/template_url_service_factory.h"
93 #include "chrome/browser/service/service_process_control.h" 94 #include "chrome/browser/service/service_process_control.h"
94 #include "chrome/browser/shell_integration.h"
95 #include "chrome/browser/translate/translate_manager.h" 95 #include "chrome/browser/translate/translate_manager.h"
96 #include "chrome/browser/ui/app_list/app_list_util.h" 96 #include "chrome/browser/ui/app_list/app_list_util.h"
97 #include "chrome/browser/ui/browser.h" 97 #include "chrome/browser/ui/browser.h"
98 #include "chrome/browser/ui/browser_finder.h" 98 #include "chrome/browser/ui/browser_finder.h"
99 #include "chrome/browser/ui/host_desktop.h" 99 #include "chrome/browser/ui/host_desktop.h"
100 #include "chrome/browser/ui/startup/default_browser_prompt.h" 100 #include "chrome/browser/ui/startup/default_browser_prompt.h"
101 #include "chrome/browser/ui/startup/startup_browser_creator.h" 101 #include "chrome/browser/ui/startup/startup_browser_creator.h"
102 #include "chrome/browser/ui/uma_browsing_activity_observer.h" 102 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
103 #include "chrome/browser/ui/user_data_dir_dialog.h" 103 #include "chrome/browser/ui/user_data_dir_dialog.h"
104 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 104 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
(...skipping 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 if (base::win::GetVersion() <= base::win::VERSION_XP) 1797 if (base::win::GetVersion() <= base::win::VERSION_XP)
1798 uma_name += "_XP"; 1798 uma_name += "_XP";
1799 1799
1800 uma_name += "_PreRead_"; 1800 uma_name += "_PreRead_";
1801 uma_name += pre_read_percentage; 1801 uma_name += pre_read_percentage;
1802 AddPreReadHistogramTime(uma_name.c_str(), time); 1802 AddPreReadHistogramTime(uma_name.c_str(), time);
1803 } 1803 }
1804 #endif 1804 #endif
1805 #endif 1805 #endif
1806 } 1806 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698