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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style 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_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 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 #if defined(OS_WIN) 1485 #if defined(OS_WIN)
1486 // We check this here because if the profile is OTR (chromeos possibility) 1486 // We check this here because if the profile is OTR (chromeos possibility)
1487 // it won't still be accessible after browser is destroyed. 1487 // it won't still be accessible after browser is destroyed.
1488 record_search_engine_ = do_first_run_tasks_ && !profile_->IsOffTheRecord(); 1488 record_search_engine_ = do_first_run_tasks_ && !profile_->IsOffTheRecord();
1489 #endif 1489 #endif
1490 1490
1491 // Create the instance of the cloud print proxy service so that it can launch 1491 // Create the instance of the cloud print proxy service so that it can launch
1492 // the service process if needed. This is needed because the service process 1492 // the service process if needed. This is needed because the service process
1493 // might have shutdown because an update was available. 1493 // might have shutdown because an update was available.
1494 // TODO(torne): this should maybe be done with 1494 // TODO(torne): this should maybe be done with
1495 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? 1495 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext()
1496 // instead?
1496 #if !defined(OS_ANDROID) 1497 #if !defined(OS_ANDROID)
1497 CloudPrintProxyServiceFactory::GetForProfile(profile_); 1498 CloudPrintProxyServiceFactory::GetForProfile(profile_);
1498 #endif 1499 #endif
1499 1500
1500 // Start watching all browser threads for responsiveness. 1501 // Start watching all browser threads for responsiveness.
1501 ThreadWatcherList::StartWatchingAll(parsed_command_line()); 1502 ThreadWatcherList::StartWatchingAll(parsed_command_line());
1502 1503
1503 #if !defined(DISABLE_NACL) 1504 #if !defined(DISABLE_NACL)
1504 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) { 1505 if (parsed_command_line().HasSwitch(switches::kPnaclDir)) {
1505 PathService::Override(chrome::DIR_PNACL_BASE, 1506 PathService::Override(chrome::DIR_PNACL_BASE,
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 if (base::win::GetVersion() <= base::win::VERSION_XP) 1809 if (base::win::GetVersion() <= base::win::VERSION_XP)
1809 uma_name += "_XP"; 1810 uma_name += "_XP";
1810 1811
1811 uma_name += "_PreRead_"; 1812 uma_name += "_PreRead_";
1812 uma_name += pre_read_percentage; 1813 uma_name += pre_read_percentage;
1813 AddPreReadHistogramTime(uma_name.c_str(), time); 1814 AddPreReadHistogramTime(uma_name.c_str(), time);
1814 } 1815 }
1815 #endif 1816 #endif
1816 #endif 1817 #endif
1817 } 1818 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698