Integrate UI with authentication flow.

blimp/client/core/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 import("//blimp/client/core/config.gni")
@@ skipping 65 matching lines @@
     "//blimp/client/core/compositor:unit_tests",
     "//blimp/client/core/contents:unit_tests",
     "//blimp/client/core/session:unit_tests",
     "//blimp/client/public:public_headers",
     "//blimp/client/test",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
+source_set("common") {
+  sources = [
+    "blimp_client_context_internal.h",
+  ]
+
+  deps = [
+    "//blimp/client/core/session",
+  ]
+}
+
 source_set("context") {
   sources = [
     "blimp_client_context_impl.cc",
     "blimp_client_context_impl.h",
   ]
 
   public_deps = [
+    ":common",
     "//base",
     "//blimp/client/core/contents",
     "//blimp/client/core/session",
     "//blimp/client/public:public_headers",
     "//url",
   ]
 
   if (is_android) {
     sources += [
       "android/blimp_client_context_impl_android.cc",
       "android/blimp_client_context_impl_android.h",
       "android/blimp_jni_registrar.cc",
     ]
 
     deps = [
       ":context_jni_headers",
+      "//blimp/client/core/settings",
     ]
   }
 }
 
 source_set("switches") {
   visibility = [
     "//blimp/client/*",
     "//blimp/engine:browser_tests",
   ]
 
@@ skipping 20 matching lines @@
         ":dummy_core_java",
       ]
     }
   }
 
   java_group("core_java") {
     visibility = [ "//blimp/client/*" ]
 
     deps = [
       ":context_java",
-      ":settings_java",
       ":switches_java",
       "//blimp/client/core/contents:contents_java",
+      "//blimp/client/core/settings:settings_java",
     ]
   }
 
   android_library("dummy_core_java") {
     visibility = [ ":*" ]
 
     java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java" ]
 
     deps = [
       "//base:base_java",
       "//blimp/client/public:public_headers_java",
     ]
   }
 
   android_library("context_java") {
     visibility = [ "//blimp/client/*" ]
 
     java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java" ]
 
     deps = [
+      ":common_java",
+      ":switches_java",
       "//base:base_java",
-      "//blimp/client/core:settings_java",
       "//blimp/client/core/contents:contents_java",
+      "//blimp/client/core/settings:settings_java",
+      "//blimp/client/public:public_headers_java",
+    ]
+  }
+
+  android_library("common_java") {
+    visibility = [ "//blimp/client/*" ]
+
+    java_files = [
+      "android/java/src/org/chromium/blimp/core/common/BlimpClientContextInternal.java",
+      "android/java/src/org/chromium/blimp/core/settings/PreferencesUtil.java",
+    ]
+
+    deps = [
+      "//base:base_java",
       "//blimp/client/public:public_headers_java",
     ]
   }
 
   android_library("switches_java") {
     visibility = [ "//blimp/client/*" ]
 
     java_files =
         [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
   }
 
-  android_library("settings_java") {
-    visibility = [ "//blimp/client/*" ]
-
-    java_files = [
-      "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java",
-      "android/java/src/org/chromium/blimp/core/settings/PreferencesUtil.java",
-    ]
-
-    # TODO(xingliu): Remove android support v7 dependency and move android resources to Chrome
-    # after Blimp merge to Chrome.
-    deps = [
-      "//base:base_java",
-      "//blimp/client:blimp_java_resources",
-      "//blimp/client/public:public_headers_java",
-      "//third_party/android_tools:android_support_v7_appcompat_java",
-    ]
-  }
-
   generate_jni("context_jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
       "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java",
     ]
 
     jni_package = "blimp/client/core"
   }
 
   generate_jni("dummy_core_jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
       "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java",
     ]
 
     jni_package = "blimp/client/core"
   }
 }