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

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

Issue 11753014: Enable the VariationsService on official builds when --variations-service-url is provided. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: init 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
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/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 return local_state_.get(); 408 return local_state_.get();
409 } 409 }
410 410
411 net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() { 411 net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
412 DCHECK(CalledOnValidThread()); 412 DCHECK(CalledOnValidThread());
413 return io_thread()->system_url_request_context_getter(); 413 return io_thread()->system_url_request_context_getter();
414 } 414 }
415 415
416 chrome_variations::VariationsService* BrowserProcessImpl::variations_service() { 416 chrome_variations::VariationsService* BrowserProcessImpl::variations_service() {
417 DCHECK(CalledOnValidThread()); 417 DCHECK(CalledOnValidThread());
418 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_ANDROID)
419 if (!variations_service_.get()) 418 if (!variations_service_.get())
420 variations_service_.reset(new chrome_variations::VariationsService()); 419 variations_service_.reset(chrome_variations::VariationsService::Create());
421 #endif
422 return variations_service_.get(); 420 return variations_service_.get();
423 } 421 }
424 422
425 #if defined(OS_CHROMEOS) 423 #if defined(OS_CHROMEOS)
426 chromeos::OomPriorityManager* BrowserProcessImpl::oom_priority_manager() { 424 chromeos::OomPriorityManager* BrowserProcessImpl::oom_priority_manager() {
427 DCHECK(CalledOnValidThread()); 425 DCHECK(CalledOnValidThread());
428 if (!oom_priority_manager_.get()) 426 if (!oom_priority_manager_.get())
429 oom_priority_manager_.reset(new chromeos::OomPriorityManager()); 427 oom_priority_manager_.reset(new chromeos::OomPriorityManager());
430 return oom_priority_manager_.get(); 428 return oom_priority_manager_.get();
431 } 429 }
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 } 960 }
963 961
964 void BrowserProcessImpl::OnAutoupdateTimer() { 962 void BrowserProcessImpl::OnAutoupdateTimer() {
965 if (CanAutorestartForUpdate()) { 963 if (CanAutorestartForUpdate()) {
966 DLOG(WARNING) << "Detected update. Restarting browser."; 964 DLOG(WARNING) << "Detected update. Restarting browser.";
967 RestartBackgroundInstance(); 965 RestartBackgroundInstance();
968 } 966 }
969 } 967 }
970 968
971 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 969 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698