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

Side by Side Diff: chrome/browser/android/chrome_application.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/android/chrome_application.h" 5 #include "chrome/browser/android/chrome_application.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/prefs/pref_service.h"
13 #include "chrome/browser/android/tab_android.h" 12 #include "chrome/browser/android/tab_android.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/net/predictor.h" 14 #include "chrome/browser/net/predictor.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/common/chrome_content_client.h" 17 #include "chrome/common/chrome_content_client.h"
18 #include "components/prefs/pref_service.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/storage_partition.h" 20 #include "content/public/browser/storage_partition.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "jni/ChromeApplication_jni.h" 22 #include "jni/ChromeApplication_jni.h"
23 #include "net/cookies/cookie_store.h" 23 #include "net/cookies/cookie_store.h"
24 #include "net/url_request/url_request_context.h" 24 #include "net/url_request/url_request_context.h"
25 #include "net/url_request/url_request_context_getter.h" 25 #include "net/url_request/url_request_context_getter.h"
26 26
27 using base::android::ConvertUTF8ToJavaString; 27 using base::android::ConvertUTF8ToJavaString;
28 28
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 124
125 bool ChromeApplication::AreParentalControlsEnabled() { 125 bool ChromeApplication::AreParentalControlsEnabled() {
126 return Java_ChromeApplication_areParentalControlsEnabled( 126 return Java_ChromeApplication_areParentalControlsEnabled(
127 base::android::AttachCurrentThread(), 127 base::android::AttachCurrentThread(),
128 base::android::GetApplicationContext()); 128 base::android::GetApplicationContext());
129 } 129 }
130 130
131 } // namespace android 131 } // namespace android
132 } // namespace chrome 132 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698