Chromium Code Reviews| 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_android.h" | 5 #include "chrome/browser/chrome_browser_main_android.h" |
| 6 | 6 |
| 7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
| 8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 base::Bind(&DeleteFileTask, bookmark_image_file_path), | 93 base::Bind(&DeleteFileTask, bookmark_image_file_path), |
| 94 base::TimeDelta::FromMinutes(1)); | 94 base::TimeDelta::FromMinutes(1)); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { | 97 void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { |
| 98 TRACE_EVENT0("startup", | 98 TRACE_EVENT0("startup", |
| 99 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization") | 99 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization") |
| 100 net::NetworkChangeNotifier::SetFactory( | 100 net::NetworkChangeNotifier::SetFactory( |
| 101 new net::NetworkChangeNotifierFactoryAndroid()); | 101 new net::NetworkChangeNotifierFactoryAndroid()); |
| 102 | 102 |
| 103 #if !defined(USE_AURA) | |
| 103 content::Compositor::Initialize(); | 104 content::Compositor::Initialize(); |
|
sky
2015/11/30 23:56:20
That this code was compiling tells me you still ha
bshe
2015/12/01 02:24:16
ifdefed the function declaration.
Sorry. I probab
| |
| 105 #endif | |
| 104 | 106 |
| 105 // Chrome on Android does not use default MessageLoop. It has its own | 107 // Chrome on Android does not use default MessageLoop. It has its own |
| 106 // Android specific MessageLoop. | 108 // Android specific MessageLoop. |
| 107 DCHECK(!main_message_loop_.get()); | 109 DCHECK(!main_message_loop_.get()); |
| 108 | 110 |
| 109 // Create and start the MessageLoop. | 111 // Create and start the MessageLoop. |
| 110 // This is a critical point in the startup process. | 112 // This is a critical point in the startup process. |
| 111 { | 113 { |
| 112 TRACE_EVENT0("startup", | 114 TRACE_EVENT0("startup", |
| 113 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:CreateUiMsgLoop"); | 115 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:CreateUiMsgLoop"); |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 133 ChromeBrowserMainParts::PostBrowserStart(); | 135 ChromeBrowserMainParts::PostBrowserStart(); |
| 134 | 136 |
| 135 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, | 137 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, |
| 136 base::Bind(&SeccompSupportDetector::StartDetection), | 138 base::Bind(&SeccompSupportDetector::StartDetection), |
| 137 base::TimeDelta::FromMinutes(1)); | 139 base::TimeDelta::FromMinutes(1)); |
| 138 } | 140 } |
| 139 | 141 |
| 140 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { | 142 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { |
| 141 NOTREACHED(); | 143 NOTREACHED(); |
| 142 } | 144 } |
| OLD | NEW |