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

Side by Side Diff: chrome/browser/ui/android/website_settings_popup_android.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/android/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/website_settings_popup_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "chrome/browser/android/resource_mapper.h" 10 #include "chrome/browser/android/resource_mapper.h"
11 #include "chrome/browser/infobars/infobar_service.h" 11 #include "chrome/browser/infobars/infobar_service.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 13 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
14 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 14 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
15 #include "chrome/browser/ui/website_settings/website_settings.h" 15 #include "chrome/browser/ui/website_settings/website_settings.h"
16 #include "chrome/grit/generated_resources.h"
16 #include "content/public/browser/browser_context.h" 17 #include "content/public/browser/browser_context.h"
17 #include "content/public/browser/cert_store.h" 18 #include "content/public/browser/cert_store.h"
18 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
19 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
20 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
21 #include "content/public/common/ssl_status.h" 22 #include "content/public/common/ssl_status.h"
22 #include "grit/generated_resources.h"
23 #include "jni/WebsiteSettingsPopup_jni.h" 23 #include "jni/WebsiteSettingsPopup_jni.h"
24 #include "net/cert/x509_certificate.h" 24 #include "net/cert/x509_certificate.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 26
27 using base::android::CheckException; 27 using base::android::CheckException;
28 using base::android::ConvertUTF8ToJavaString; 28 using base::android::ConvertUTF8ToJavaString;
29 using base::android::ConvertUTF16ToJavaString; 29 using base::android::ConvertUTF16ToJavaString;
30 using base::android::GetClass; 30 using base::android::GetClass;
31 using base::android::ScopedJavaLocalRef; 31 using base::android::ScopedJavaLocalRef;
32 using content::CertStore; 32 using content::CertStore;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void WebsiteSettingsPopupAndroid::SetFirstVisit( 198 void WebsiteSettingsPopupAndroid::SetFirstVisit(
199 const base::string16& first_visit) { 199 const base::string16& first_visit) {
200 NOTIMPLEMENTED(); 200 NOTIMPLEMENTED();
201 } 201 }
202 202
203 // static 203 // static
204 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 204 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
205 JNIEnv* env) { 205 JNIEnv* env) {
206 return RegisterNativesImpl(env); 206 return RegisterNativesImpl(env);
207 } 207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698