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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 11260033: Fix --enable-stats-table crash on Release builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | no next file » | 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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 #if defined(OS_MACOSX) || defined(OS_WIN) 552 #if defined(OS_MACOSX) || defined(OS_WIN)
553 CheckUserDataDirPolicy(&user_data_dir); 553 CheckUserDataDirPolicy(&user_data_dir);
554 #endif 554 #endif
555 if (!user_data_dir.empty()) { 555 if (!user_data_dir.empty()) {
556 CHECK(PathService::OverrideAndCreateIfNeeded( 556 CHECK(PathService::OverrideAndCreateIfNeeded(
557 chrome::DIR_USER_DATA, 557 chrome::DIR_USER_DATA,
558 user_data_dir, 558 user_data_dir,
559 chrome::ProcessNeedsProfileDir(process_type))); 559 chrome::ProcessNeedsProfileDir(process_type)));
560 } 560 }
561 561
562 base::StatsCounterTimer stats_counter_timer("Chrome.Init"); 562 stats_counter_timer_.reset(new base::StatsCounterTimer("Chrome.Init"));
563 startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer> 563 startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
564 (stats_counter_timer)); 564 (*stats_counter_timer_));
565 565
566 // Enable the heap profiler as early as possible! 566 // Enable the heap profiler as early as possible!
567 EnableHeapProfiler(command_line); 567 EnableHeapProfiler(command_line);
568 568
569 // Enable Message Loop related state asap. 569 // Enable Message Loop related state asap.
570 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) 570 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer))
571 MessageLoop::EnableHistogrammer(true); 571 MessageLoop::EnableHistogrammer(true);
572 572
573 #if !defined(OS_ANDROID) 573 #if !defined(OS_ANDROID)
574 // Android does InitLogging when library is loaded. Skip here. 574 // Android does InitLogging when library is loaded. Skip here.
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 774
775 content::ContentRendererClient* 775 content::ContentRendererClient*
776 ChromeMainDelegate::CreateContentRendererClient() { 776 ChromeMainDelegate::CreateContentRendererClient() {
777 return &g_chrome_content_renderer_client.Get(); 777 return &g_chrome_content_renderer_client.Get();
778 } 778 }
779 779
780 content::ContentUtilityClient* 780 content::ContentUtilityClient*
781 ChromeMainDelegate::CreateContentUtilityClient() { 781 ChromeMainDelegate::CreateContentUtilityClient() {
782 return &g_chrome_content_utility_client.Get(); 782 return &g_chrome_content_utility_client.Get();
783 } 783 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698