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

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

Issue 154203002: Remove unnecessary uses of aura::Env::GetDispatcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 return true; // Don't run the default message loop. 1624 return true; // Don't run the default message loop.
1625 1625
1626 // These should be invoked as close to the start of the browser's 1626 // These should be invoked as close to the start of the browser's
1627 // UI thread message loop as possible to get a stable measurement 1627 // UI thread message loop as possible to get a stable measurement
1628 // across versions. 1628 // across versions.
1629 RecordBrowserStartupTime(); 1629 RecordBrowserStartupTime();
1630 startup_timer_->SignalStartupComplete( 1630 startup_timer_->SignalStartupComplete(
1631 performance_monitor::StartupTimer::STARTUP_NORMAL); 1631 performance_monitor::StartupTimer::STARTUP_NORMAL);
1632 1632
1633 DCHECK(base::MessageLoopForUI::IsCurrent()); 1633 DCHECK(base::MessageLoopForUI::IsCurrent());
1634 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
1635 views::AcceleratorHandler accelerator_handler;
1636 base::RunLoop run_loop(&accelerator_handler);
1637 #else
1638 base::RunLoop run_loop; 1634 base::RunLoop run_loop;
1639 #endif
1640 1635
1641 performance_monitor::PerformanceMonitor::GetInstance()->StartGatherCycle(); 1636 performance_monitor::PerformanceMonitor::GetInstance()->StartGatherCycle();
1642 1637
1643 MetricsService::SetExecutionPhase(MetricsService::MAIN_MESSAGE_LOOP_RUN); 1638 MetricsService::SetExecutionPhase(MetricsService::MAIN_MESSAGE_LOOP_RUN);
1644 run_loop.Run(); 1639 run_loop.Run();
1645 1640
1646 return true; 1641 return true;
1647 #endif 1642 #endif
1648 } 1643 }
1649 1644
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1709 chromeos::CrosSettings::Shutdown(); 1704 chromeos::CrosSettings::Shutdown();
1710 #endif 1705 #endif
1711 #endif 1706 #endif
1712 } 1707 }
1713 1708
1714 // Public members: 1709 // Public members:
1715 1710
1716 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1711 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1717 chrome_extra_parts_.push_back(parts); 1712 chrome_extra_parts_.push_back(parts);
1718 } 1713 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698