OLD | NEW |
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 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1614 performance_monitor::StartupTimer::STARTUP_NORMAL); | 1614 performance_monitor::StartupTimer::STARTUP_NORMAL); |
1615 | 1615 |
1616 DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); | 1616 DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
1617 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) | 1617 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) |
1618 views::AcceleratorHandler accelerator_handler; | 1618 views::AcceleratorHandler accelerator_handler; |
1619 base::RunLoop run_loop(&accelerator_handler); | 1619 base::RunLoop run_loop(&accelerator_handler); |
1620 #else | 1620 #else |
1621 base::RunLoop run_loop; | 1621 base::RunLoop run_loop; |
1622 #endif | 1622 #endif |
1623 | 1623 |
1624 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1624 performance_monitor::PerformanceMonitor::GetInstance()->Start(); |
1625 switches::kPerformanceMonitorGathering)) { | |
1626 performance_monitor::PerformanceMonitor::GetInstance()->Start(); | |
1627 } | |
1628 | 1625 |
1629 run_loop.Run(); | 1626 run_loop.Run(); |
1630 | 1627 |
1631 return true; | 1628 return true; |
1632 #endif | 1629 #endif |
1633 } | 1630 } |
1634 | 1631 |
1635 void ChromeBrowserMainParts::PostMainMessageLoopRun() { | 1632 void ChromeBrowserMainParts::PostMainMessageLoopRun() { |
1636 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostMainMessageLoopRun"); | 1633 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostMainMessageLoopRun"); |
1637 #if defined(OS_ANDROID) | 1634 #if defined(OS_ANDROID) |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1694 chromeos::CrosSettings::Shutdown(); | 1691 chromeos::CrosSettings::Shutdown(); |
1695 #endif | 1692 #endif |
1696 #endif | 1693 #endif |
1697 } | 1694 } |
1698 | 1695 |
1699 // Public members: | 1696 // Public members: |
1700 | 1697 |
1701 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1698 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1702 chrome_extra_parts_.push_back(parts); | 1699 chrome_extra_parts_.push_back(parts); |
1703 } | 1700 } |
OLD | NEW |