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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 187713002: Android: temporarily disable ThreadWatcherAndroid integration. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index f61d372681fb71c4568f367243ca2ac2aa78a13b..2f952b43985d38856b6cc104fc168528361b85dc 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -144,10 +144,6 @@
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
-#if defined(OS_ANDROID)
-#include "chrome/browser/metrics/thread_watcher_android.h"
-#endif
-
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "chrome/browser/first_run/upgrade_util_linux.h"
#include "chrome/browser/sxs_linux.h"
@@ -1467,10 +1463,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START);
ThreadWatcherList::StartWatchingAll(parsed_command_line());
-#if defined(OS_ANDROID)
- ThreadWatcherAndroid::RegisterApplicationStatusListener();
-#endif
-
#if !defined(DISABLE_NACL)
if (parsed_command_line().HasSwitch(switches::kPnaclDir)) {
PathService::Override(chrome::DIR_PNACL_BASE,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698