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

Unified Diff: chrome/browser/chrome_browser_main_android.cc

Issue 1403293003: Introduce AndroidFocusRules and NativeWidgetAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_browser_main_android.cc
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
index 4fd6d9d710200af8f35ce61a540c1c81723864ef..7bdfc1892cf330bb7fc9531aaf6cbbc0d3923bf9 100644
--- a/chrome/browser/chrome_browser_main_android.cc
+++ b/chrome/browser/chrome_browser_main_android.cc
@@ -28,6 +28,10 @@
#include "ui/base/resource/resource_bundle_android.h"
#include "ui/base/ui_base_paths.h"
+#if defined(USE_AURA)
+#include "ui/wm/android/window_tree_host_manager.h"
+#endif
+
namespace {
void DeleteFileTask(
@@ -46,6 +50,14 @@ ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid(
ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() {
}
+#if defined(USE_AURA)
+void ChromeBrowserMainPartsAndroid::InitAura() {
+ window_tree_host_manager_.reset(new WindowTreeHostManager(
+ gfx::Size(800, 600), content::GetContextFactory()));
+ window_tree_host_manager_->host()->Show();
+}
+#endif
+
int ChromeBrowserMainPartsAndroid::PreCreateThreads() {
TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreCreateThreads")
@@ -80,6 +92,13 @@ int ChromeBrowserMainPartsAndroid::PreCreateThreads() {
return ChromeBrowserMainParts::PreCreateThreads();
}
+void ChromeBrowserMainPartsAndroid::PreProfileInit() {
+#if defined(USE_AURA)
+ InitAura();
+#endif
+ ChromeBrowserMainParts::PreProfileInit();
+}
+
void ChromeBrowserMainPartsAndroid::PostProfileInit() {
ChromeBrowserMainParts::PostProfileInit();

Powered by Google App Engine
This is Rietveld 408576698