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

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

Issue 2374213002: Revert of Move registration of Java mojo interfaces to the new InterfaceRegistrar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java-content-interface-registry
Patch Set: Created 4 years, 2 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
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_android.h" 5 #include "chrome/browser/chrome_browser_main_android.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
13 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
14 #include "chrome/browser/android/seccomp_support_detector.h" 13 #include "chrome/browser/android/seccomp_support_detector.h"
15 #include "chrome/browser/signin/signin_manager_factory.h" 14 #include "chrome/browser/signin/signin_manager_factory.h"
16 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
17 #include "components/crash/content/app/breakpad_linux.h" 16 #include "components/crash/content/app/breakpad_linux.h"
18 #include "components/crash/content/browser/crash_dump_manager_android.h" 17 #include "components/crash/content/browser/crash_dump_manager_android.h"
19 #include "components/signin/core/browser/signin_manager.h" 18 #include "components/signin/core/browser/signin_manager.h"
20 #include "content/public/browser/android/compositor.h" 19 #include "content/public/browser/android/compositor.h"
21 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
22 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
23 #include "net/android/network_change_notifier_factory_android.h" 22 #include "net/android/network_change_notifier_factory_android.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 116
118 ChromeBrowserMainParts::PreEarlyInitialization(); 117 ChromeBrowserMainParts::PreEarlyInitialization();
119 } 118 }
120 119
121 void ChromeBrowserMainPartsAndroid::PostBrowserStart() { 120 void ChromeBrowserMainPartsAndroid::PostBrowserStart() {
122 ChromeBrowserMainParts::PostBrowserStart(); 121 ChromeBrowserMainParts::PostBrowserStart();
123 122
124 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, 123 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
125 base::Bind(&SeccompSupportDetector::StartDetection), 124 base::Bind(&SeccompSupportDetector::StartDetection),
126 base::TimeDelta::FromMinutes(1)); 125 base::TimeDelta::FromMinutes(1));
127
128 RegisterChromeJavaMojoInterfaces();
129 } 126 }
130 127
131 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { 128 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
132 NOTREACHED(); 129 NOTREACHED();
133 } 130 }
OLDNEW
« no previous file with comments | « chrome/browser/android/mojo/chrome_interface_registrar_android.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698