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

Side by Side Diff: chrome/browser/android/webapk/webapk_installer.cc

Issue 2915913002: [WebAPKs] Display same text for menu & engagement banner (Closed)
Patch Set: Merge branch 'master' into same_infobar_title Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/android/webapk/webapk_installer.h" 5 #include "chrome/browser/android/webapk/webapk_installer.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/path_utils.h" 10 #include "base/android/path_utils.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 void WebApkInstaller::InstallOrUpdateWebApk(const std::string& package_name, 277 void WebApkInstaller::InstallOrUpdateWebApk(const std::string& package_name,
278 int version, 278 int version,
279 const std::string& token) { 279 const std::string& token) {
280 webapk_package_ = package_name; 280 webapk_package_ = package_name;
281 281
282 JNIEnv* env = base::android::AttachCurrentThread(); 282 JNIEnv* env = base::android::AttachCurrentThread();
283 base::android::ScopedJavaLocalRef<jstring> java_webapk_package = 283 base::android::ScopedJavaLocalRef<jstring> java_webapk_package =
284 base::android::ConvertUTF8ToJavaString(env, webapk_package_); 284 base::android::ConvertUTF8ToJavaString(env, webapk_package_);
285 base::android::ScopedJavaLocalRef<jstring> java_title = 285 base::android::ScopedJavaLocalRef<jstring> java_title =
286 base::android::ConvertUTF16ToJavaString(env, shortcut_info_.user_title); 286 base::android::ConvertUTF16ToJavaString(env, shortcut_info_.short_name);
287 base::android::ScopedJavaLocalRef<jstring> java_token = 287 base::android::ScopedJavaLocalRef<jstring> java_token =
288 base::android::ConvertUTF8ToJavaString(env, token); 288 base::android::ConvertUTF8ToJavaString(env, token);
289 base::android::ScopedJavaLocalRef<jstring> java_url = 289 base::android::ScopedJavaLocalRef<jstring> java_url =
290 base::android::ConvertUTF8ToJavaString(env, shortcut_info_.url.spec()); 290 base::android::ConvertUTF8ToJavaString(env, shortcut_info_.url.spec());
291 291
292 if (task_type_ == WebApkInstaller::INSTALL) { 292 if (task_type_ == WebApkInstaller::INSTALL) {
293 webapk::TrackRequestTokenDuration(install_duration_timer_->Elapsed()); 293 webapk::TrackRequestTokenDuration(install_duration_timer_->Elapsed());
294 Java_WebApkInstaller_installWebApkAsync(env, java_ref_, java_webapk_package, 294 Java_WebApkInstaller_installWebApkAsync(env, java_ref_, java_webapk_package,
295 version, java_title, java_token, 295 version, java_title, java_token,
296 java_url, shortcut_info_.source); 296 java_url, shortcut_info_.source);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 net::URLFetcher::Create(server_url_, net::URLFetcher::POST, this); 477 net::URLFetcher::Create(server_url_, net::URLFetcher::POST, this);
478 url_fetcher_->SetRequestContext(request_context_getter_); 478 url_fetcher_->SetRequestContext(request_context_getter_);
479 std::string serialized_request; 479 std::string serialized_request;
480 request_proto->SerializeToString(&serialized_request); 480 request_proto->SerializeToString(&serialized_request);
481 url_fetcher_->SetUploadData(kProtoMimeType, serialized_request); 481 url_fetcher_->SetUploadData(kProtoMimeType, serialized_request);
482 url_fetcher_->SetLoadFlags( 482 url_fetcher_->SetLoadFlags(
483 net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES | 483 net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES |
484 net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_AUTH_DATA); 484 net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_AUTH_DATA);
485 url_fetcher_->Start(); 485 url_fetcher_->Start();
486 } 486 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698