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

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

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/common/child_process_logging.h" 94 #include "chrome/common/child_process_logging.h"
95 #include "chrome/common/chrome_constants.h" 95 #include "chrome/common/chrome_constants.h"
96 #include "chrome/common/chrome_paths.h" 96 #include "chrome/common/chrome_paths.h"
97 #include "chrome/common/chrome_result_codes.h" 97 #include "chrome/common/chrome_result_codes.h"
98 #include "chrome/common/chrome_switches.h" 98 #include "chrome/common/chrome_switches.h"
99 #include "chrome/common/env_vars.h" 99 #include "chrome/common/env_vars.h"
100 #include "chrome/common/jstemplate_builder.h"
101 #include "chrome/common/logging_chrome.h" 100 #include "chrome/common/logging_chrome.h"
102 #include "chrome/common/metrics/variations/variations_util.h" 101 #include "chrome/common/metrics/variations/variations_util.h"
103 #include "chrome/common/net/net_resource_provider.h" 102 #include "chrome/common/net/net_resource_provider.h"
104 #include "chrome/common/pref_names.h" 103 #include "chrome/common/pref_names.h"
105 #include "chrome/common/profiling.h" 104 #include "chrome/common/profiling.h"
106 #include "chrome/common/startup_metric_utils.h" 105 #include "chrome/common/startup_metric_utils.h"
107 #include "chrome/installer/util/google_update_settings.h" 106 #include "chrome/installer/util/google_update_settings.h"
108 #include "content/public/browser/browser_thread.h" 107 #include "content/public/browser/browser_thread.h"
109 #include "content/public/common/content_client.h" 108 #include "content/public/common/content_client.h"
110 #include "content/public/common/content_switches.h" 109 #include "content/public/common/content_switches.h"
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 if (base::win::GetVersion() <= base::win::VERSION_XP) 1643 if (base::win::GetVersion() <= base::win::VERSION_XP)
1645 uma_name += "_XP"; 1644 uma_name += "_XP";
1646 1645
1647 uma_name += "_PreRead_"; 1646 uma_name += "_PreRead_";
1648 uma_name += pre_read_percentage; 1647 uma_name += pre_read_percentage;
1649 AddPreReadHistogramTime(uma_name.c_str(), time); 1648 AddPreReadHistogramTime(uma_name.c_str(), time);
1650 } 1649 }
1651 #endif 1650 #endif
1652 #endif 1651 #endif
1653 } 1652 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698