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

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

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address more comments Created 7 years, 6 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
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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #include "chrome/common/chrome_paths.h" 111 #include "chrome/common/chrome_paths.h"
112 #include "chrome/common/chrome_result_codes.h" 112 #include "chrome/common/chrome_result_codes.h"
113 #include "chrome/common/chrome_switches.h" 113 #include "chrome/common/chrome_switches.h"
114 #include "chrome/common/env_vars.h" 114 #include "chrome/common/env_vars.h"
115 #include "chrome/common/logging_chrome.h" 115 #include "chrome/common/logging_chrome.h"
116 #include "chrome/common/net/net_resource_provider.h" 116 #include "chrome/common/net/net_resource_provider.h"
117 #include "chrome/common/pref_names.h" 117 #include "chrome/common/pref_names.h"
118 #include "chrome/common/profiling.h" 118 #include "chrome/common/profiling.h"
119 #include "chrome/common/startup_metric_utils.h" 119 #include "chrome/common/startup_metric_utils.h"
120 #include "chrome/installer/util/google_update_settings.h" 120 #include "chrome/installer/util/google_update_settings.h"
121 #include "chrome/nacl/nacl_switches.h"
121 #include "content/public/browser/browser_thread.h" 122 #include "content/public/browser/browser_thread.h"
122 #include "content/public/browser/notification_observer.h" 123 #include "content/public/browser/notification_observer.h"
123 #include "content/public/browser/notification_registrar.h" 124 #include "content/public/browser/notification_registrar.h"
124 #include "content/public/browser/notification_service.h" 125 #include "content/public/browser/notification_service.h"
125 #include "content/public/browser/notification_types.h" 126 #include "content/public/browser/notification_types.h"
126 #include "content/public/browser/site_instance.h" 127 #include "content/public/browser/site_instance.h"
127 #include "content/public/common/content_client.h" 128 #include "content/public/common/content_client.h"
128 #include "content/public/common/content_switches.h" 129 #include "content/public/common/content_switches.h"
129 #include "content/public/common/main_function_params.h" 130 #include "content/public/common/main_function_params.h"
130 #include "grit/app_locale_settings.h" 131 #include "grit/app_locale_settings.h"
(...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 if (base::win::GetVersion() <= base::win::VERSION_XP) 1775 if (base::win::GetVersion() <= base::win::VERSION_XP)
1775 uma_name += "_XP"; 1776 uma_name += "_XP";
1776 1777
1777 uma_name += "_PreRead_"; 1778 uma_name += "_PreRead_";
1778 uma_name += pre_read_percentage; 1779 uma_name += pre_read_percentage;
1779 AddPreReadHistogramTime(uma_name.c_str(), time); 1780 AddPreReadHistogramTime(uma_name.c_str(), time);
1780 } 1781 }
1781 #endif 1782 #endif
1782 #endif 1783 #endif
1783 } 1784 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698