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

Unified Diff: blimp/client/BUILD.gn

Issue 1422363008: Add a basic UI to the Android Blimp client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made sure to clear old control data Created 5 years, 1 month 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
« no previous file with comments | « no previous file | blimp/client/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index bccbf44f830fb7b5411219f1d65201e34970ae8e..7c8f7f504a32ee715d9863ad88f70c82d44d61e4 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -22,12 +22,14 @@ shared_library("blimp_client") {
deps = [
"//base",
"//blimp/common:blimp_common",
+ "//blimp/common/proto",
"//cc",
"//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/common:gles2_utils",
"//gpu/skia_bindings",
"//ui/gfx/geometry",
"//ui/gl",
+ "//url:url",
]
if (is_android) {
@@ -38,6 +40,8 @@ shared_library("blimp_client") {
"android/blimp_library_loader.h",
"android/blimp_view.cc",
"android/blimp_view.h",
+ "android/toolbar.cc",
+ "android/toolbar.h",
"compositor/blimp_compositor_android.cc",
"compositor/blimp_compositor_android.h",
]
@@ -72,6 +76,7 @@ if (is_android) {
sources = [
"android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
"android/java/src/org/chromium/blimp/BlimpView.java",
+ "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
]
jni_package = "blimp"
@@ -154,6 +159,8 @@ if (is_android) {
"android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
"android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
"android/java/src/org/chromium/blimp/BlimpView.java",
+ "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+ "android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
]
}
« no previous file with comments | « no previous file | blimp/client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698