Integrate UI with authentication flow.

blimp/client/core/BUILD.gn

Index: blimp/client/core/BUILD.gn
diff --git a/blimp/client/core/BUILD.gn b/blimp/client/core/BUILD.gn
index 4233dc9ab66d40e1645f30790659b07abea0c3d1..be574280b7286c701ac685e7271ac320bbdfefbe 100644
--- a/blimp/client/core/BUILD.gn
+++ b/blimp/client/core/BUILD.gn
@@ -83,6 +83,16 @@ source_set("unit_tests") {
   ]
 }
 
+source_set("common") {
+  sources = [
+    "blimp_client_context_internal.h",
+  ]
+
+  deps = [
+    "//blimp/client/core/session",
+  ]
+}
+
 source_set("context") {
   sources = [
     "blimp_client_context_impl.cc",
@@ -90,6 +100,7 @@ source_set("context") {
   ]
 
   public_deps = [
+    ":common",
     "//base",
     "//blimp/client/core/contents",
     "//blimp/client/core/session",
@@ -106,6 +117,7 @@ source_set("context") {
 
     deps = [
       ":context_jni_headers",
+      "//blimp/client/core/settings",
     ]
   }
 }
@@ -146,9 +158,9 @@ if (is_android) {
 
     deps = [
       ":context_java",
-      ":settings_java",
       ":switches_java",
       "//blimp/client/core/contents:contents_java",
+      "//blimp/client/core/settings:settings_java",
     ]
   }
 
@@ -169,38 +181,36 @@ if (is_android) {
     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("switches_java") {
-    visibility = [ "//blimp/client/*" ]
-
-    java_files =
-        [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
-  }
-
-  android_library("settings_java") {
+  android_library("common_java") {
     visibility = [ "//blimp/client/*" ]
 
     java_files = [
-      "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java",
+      "android/java/src/org/chromium/blimp/core/common/BlimpClientContextInternal.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",
     ]
   }
 
+  android_library("switches_java") {
+    visibility = [ "//blimp/client/*" ]
+
+    java_files =
+        [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
+  }
+
   generate_jni("context_jni_headers") {
     visibility = [ ":*" ]