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

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

Issue 552393002: Convert this static method to a member method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@product_string_path
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | components/metrics/metrics_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1403 matching lines...) Expand 10 before | Expand all | Expand 10 after
1414 metrics::MetricsService::SetExecutionPhase( 1414 metrics::MetricsService::SetExecutionPhase(
1415 metrics::MetricsService::STARTUP_TIMEBOMB_ARM, 1415 metrics::MetricsService::STARTUP_TIMEBOMB_ARM,
1416 g_browser_process->local_state()); 1416 g_browser_process->local_state());
1417 startup_watcher_->Arm(base::TimeDelta::FromSeconds(300)); 1417 startup_watcher_->Arm(base::TimeDelta::FromSeconds(300));
1418 1418
1419 // On mobile, need for clean shutdown arises only when the application comes 1419 // On mobile, need for clean shutdown arises only when the application comes
1420 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). 1420 // to foreground (i.e. MetricsService::OnAppEnterForeground is called).
1421 // http://crbug.com/179143 1421 // http://crbug.com/179143
1422 #if !defined(OS_ANDROID) 1422 #if !defined(OS_ANDROID)
1423 // Start watching for a hang. 1423 // Start watching for a hang.
1424 metrics::MetricsService::LogNeedForCleanShutdown( 1424 browser_process_->metrics_service()->LogNeedForCleanShutdown();
1425 g_browser_process->local_state());
1426 #endif 1425 #endif
1427 1426
1428 #if defined(ENABLE_FULL_PRINTING) 1427 #if defined(ENABLE_FULL_PRINTING)
1429 // Create the instance of the cloud print proxy service so that it can launch 1428 // Create the instance of the cloud print proxy service so that it can launch
1430 // the service process if needed. This is needed because the service process 1429 // the service process if needed. This is needed because the service process
1431 // might have shutdown because an update was available. 1430 // might have shutdown because an update was available.
1432 // TODO(torne): this should maybe be done with 1431 // TODO(torne): this should maybe be done with
1433 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() 1432 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext()
1434 // instead? 1433 // instead?
1435 CloudPrintProxyServiceFactory::GetForProfile(profile_); 1434 CloudPrintProxyServiceFactory::GetForProfile(profile_);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 chromeos::CrosSettings::Shutdown(); 1681 chromeos::CrosSettings::Shutdown();
1683 #endif 1682 #endif
1684 #endif 1683 #endif
1685 } 1684 }
1686 1685
1687 // Public members: 1686 // Public members:
1688 1687
1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1690 chrome_extra_parts_.push_back(parts); 1689 chrome_extra_parts_.push_back(parts);
1691 } 1690 }
OLDNEW
« no previous file with comments | « no previous file | components/metrics/metrics_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698