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

Side by Side Diff: chrome/browser/browser_process_impl.h

Issue 6992081: Make --allow-cross-domain-auth-prompt equivalent to a preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual GoogleURLTracker* google_url_tracker(); 92 virtual GoogleURLTracker* google_url_tracker();
93 virtual IntranetRedirectDetector* intranet_redirect_detector(); 93 virtual IntranetRedirectDetector* intranet_redirect_detector();
94 virtual const std::string& GetApplicationLocale(); 94 virtual const std::string& GetApplicationLocale();
95 virtual void SetApplicationLocale(const std::string& locale); 95 virtual void SetApplicationLocale(const std::string& locale);
96 virtual DownloadStatusUpdater* download_status_updater(); 96 virtual DownloadStatusUpdater* download_status_updater();
97 virtual base::WaitableEvent* shutdown_event(); 97 virtual base::WaitableEvent* shutdown_event();
98 virtual TabCloseableStateWatcher* tab_closeable_state_watcher(); 98 virtual TabCloseableStateWatcher* tab_closeable_state_watcher();
99 virtual safe_browsing::ClientSideDetectionService* 99 virtual safe_browsing::ClientSideDetectionService*
100 safe_browsing_detection_service(); 100 safe_browsing_detection_service();
101 virtual bool plugin_finder_disabled() const; 101 virtual bool plugin_finder_disabled() const;
102 virtual bool allow_cross_origin_auth_prompt() const;
102 103
103 // NotificationObserver methods 104 // NotificationObserver methods
104 virtual void Observe(NotificationType type, 105 virtual void Observe(NotificationType type,
105 const NotificationSource& source, 106 const NotificationSource& source,
106 const NotificationDetails& details); 107 const NotificationDetails& details);
107 108
108 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 109 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
109 virtual void StartAutoupdateTimer(); 110 virtual void StartAutoupdateTimer();
110 #endif 111 #endif
111 112
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 276
276 // Lives here so can safely log events on shutdown. 277 // Lives here so can safely log events on shutdown.
277 scoped_ptr<ChromeNetLog> net_log_; 278 scoped_ptr<ChromeNetLog> net_log_;
278 279
279 NotificationRegistrar notification_registrar_; 280 NotificationRegistrar notification_registrar_;
280 scoped_refptr<PluginDataRemover> plugin_data_remover_; 281 scoped_refptr<PluginDataRemover> plugin_data_remover_;
281 282
282 // Monitors the state of the 'DisablePluginFinder' policy. 283 // Monitors the state of the 'DisablePluginFinder' policy.
283 BooleanPrefMember plugin_finder_disabled_pref_; 284 BooleanPrefMember plugin_finder_disabled_pref_;
284 285
286 // Monitors the state for the 'AllowCrossOriginPrompt' policy.
287 BooleanPrefMember allow_cross_origin_auth_prompt_pref_;
288
285 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 289 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
286 base::RepeatingTimer<BrowserProcessImpl> autoupdate_timer_; 290 base::RepeatingTimer<BrowserProcessImpl> autoupdate_timer_;
287 291
288 // Gets called by autoupdate timer to see if browser needs restart and can be 292 // Gets called by autoupdate timer to see if browser needs restart and can be
289 // restarted, and if that's the case, restarts the browser. 293 // restarted, and if that's the case, restarts the browser.
290 void OnAutoupdateTimer(); 294 void OnAutoupdateTimer();
291 bool CanAutorestartForUpdate() const; 295 bool CanAutorestartForUpdate() const;
292 void RestartPersistentInstance(); 296 void RestartPersistentInstance();
293 #endif // defined(OS_WIN) || defined(OS_LINUX) 297 #endif // defined(OS_WIN) || defined(OS_LINUX)
294 298
295 #if defined(OS_CHROMEOS) 299 #if defined(OS_CHROMEOS)
296 scoped_refptr<chromeos::ProxyConfigServiceImpl> 300 scoped_refptr<chromeos::ProxyConfigServiceImpl>
297 chromeos_proxy_config_service_impl_; 301 chromeos_proxy_config_service_impl_;
298 #endif 302 #endif
299 303
300 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 304 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
301 }; 305 };
302 306
303 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 307 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698