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

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

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing static initializer Created 7 years, 7 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_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include "grit/generated_resources.h" 120 #include "grit/generated_resources.h"
121 #include "grit/ui_resources.h" 121 #include "grit/ui_resources.h"
122 #include "net/base/escape.h" 122 #include "net/base/escape.h"
123 #include "net/base/mime_util.h" 123 #include "net/base/mime_util.h"
124 #include "net/cookies/canonical_cookie.h" 124 #include "net/cookies/canonical_cookie.h"
125 #include "net/cookies/cookie_options.h" 125 #include "net/cookies/cookie_options.h"
126 #include "net/ssl/ssl_cert_request_info.h" 126 #include "net/ssl/ssl_cert_request_info.h"
127 #include "ppapi/host/ppapi_host.h" 127 #include "ppapi/host/ppapi_host.h"
128 #include "ui/base/l10n/l10n_util.h" 128 #include "ui/base/l10n/l10n_util.h"
129 #include "ui/base/resource/resource_bundle.h" 129 #include "ui/base/resource/resource_bundle.h"
130 #include "ui/message_center/message_center_util.h"
130 #include "webkit/glue/webpreferences.h" 131 #include "webkit/glue/webpreferences.h"
131 #include "webkit/plugins/plugin_switches.h" 132 #include "webkit/plugins/plugin_switches.h"
132 133
133 #if defined(OS_WIN) 134 #if defined(OS_WIN)
134 #include "chrome/browser/chrome_browser_main_win.h" 135 #include "chrome/browser/chrome_browser_main_win.h"
135 #include "sandbox/win/src/sandbox_policy.h" 136 #include "sandbox/win/src/sandbox_policy.h"
136 #elif defined(OS_MACOSX) 137 #elif defined(OS_MACOSX)
137 #include "chrome/browser/chrome_browser_main_mac.h" 138 #include "chrome/browser/chrome_browser_main_mac.h"
138 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 139 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
139 #elif defined(OS_CHROMEOS) 140 #elif defined(OS_CHROMEOS)
(...skipping 14 matching lines...) Expand all
154 155
155 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) 156 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
156 #include "base/linux_util.h" 157 #include "base/linux_util.h"
157 #include "chrome/browser/crash_handler_host_linux.h" 158 #include "chrome/browser/crash_handler_host_linux.h"
158 #endif 159 #endif
159 160
160 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 161 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
161 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 162 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
162 #endif 163 #endif
163 164
164 #if defined(ENABLE_MESSAGE_CENTER)
165 #include "ui/message_center/message_center_util.h"
166 #endif
167
168 #if defined(OS_ANDROID) 165 #if defined(OS_ANDROID)
169 #include "ui/base/ui_base_paths.h" 166 #include "ui/base/ui_base_paths.h"
170 #endif 167 #endif
171 168
172 #if defined(USE_NSS) 169 #if defined(USE_NSS)
173 #include "chrome/browser/ui/crypto_module_password_dialog.h" 170 #include "chrome/browser/ui/crypto_module_password_dialog.h"
174 #endif 171 #endif
175 172
176 #if !defined(OS_CHROMEOS) 173 #if !defined(OS_CHROMEOS)
177 #include "chrome/browser/signin/signin_manager.h" 174 #include "chrome/browser/signin/signin_manager.h"
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 SigninManager* signin_manager = 1217 SigninManager* signin_manager =
1221 SigninManagerFactory::GetForProfile(profile); 1218 SigninManagerFactory::GetForProfile(profile);
1222 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) 1219 if (signin_manager && signin_manager->IsSigninProcess(process->GetID()))
1223 command_line->AppendSwitch(switches::kSigninProcess); 1220 command_line->AppendSwitch(switches::kSigninProcess);
1224 #endif 1221 #endif
1225 } 1222 }
1226 1223
1227 if (content::IsThreadedCompositingEnabled()) 1224 if (content::IsThreadedCompositingEnabled())
1228 command_line->AppendSwitch(switches::kEnableThreadedCompositing); 1225 command_line->AppendSwitch(switches::kEnableThreadedCompositing);
1229 1226
1230 #if defined(ENABLE_MESSAGE_CENTER)
1231 if (message_center::IsRichNotificationEnabled()) 1227 if (message_center::IsRichNotificationEnabled())
1232 command_line->AppendSwitch(switches::kDisableHTMLNotifications); 1228 command_line->AppendSwitch(switches::kDisableHTMLNotifications);
1233 #endif
1234 1229
1235 // Please keep this in alphabetical order. 1230 // Please keep this in alphabetical order.
1236 static const char* const kSwitchNames[] = { 1231 static const char* const kSwitchNames[] = {
1237 autofill::switches::kEnableExperimentalFormFilling, 1232 autofill::switches::kEnableExperimentalFormFilling,
1238 switches::kAllowHTTPBackgroundPage, 1233 switches::kAllowHTTPBackgroundPage,
1239 switches::kAllowLegacyExtensionManifests, 1234 switches::kAllowLegacyExtensionManifests,
1240 switches::kAllowScriptingGallery, 1235 switches::kAllowScriptingGallery,
1241 switches::kAppsCheckoutURL, 1236 switches::kAppsCheckoutURL,
1242 switches::kAppsGalleryURL, 1237 switches::kAppsGalleryURL,
1243 switches::kCloudPrintServiceURL, 1238 switches::kCloudPrintServiceURL,
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 #if defined(USE_NSS) 2287 #if defined(USE_NSS)
2293 crypto::CryptoModuleBlockingPasswordDelegate* 2288 crypto::CryptoModuleBlockingPasswordDelegate*
2294 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2289 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2295 const GURL& url) { 2290 const GURL& url) {
2296 return chrome::NewCryptoModuleBlockingDialogDelegate( 2291 return chrome::NewCryptoModuleBlockingDialogDelegate(
2297 chrome::kCryptoModulePasswordKeygen, url.host()); 2292 chrome::kCryptoModulePasswordKeygen, url.host());
2298 } 2293 }
2299 #endif 2294 #endif
2300 2295
2301 } // namespace chrome 2296 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/extensions/api/notifications/notifications_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698