OLD | NEW |
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/shortcut_helper.h" | 5 #include "chrome/browser/android/shortcut_helper.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 | 8 |
| 9 #include "base/android/context_utils.h" |
9 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
10 #include "base/android/jni_array.h" | 11 #include "base/android/jni_array.h" |
11 #include "base/android/jni_string.h" | 12 #include "base/android/jni_string.h" |
12 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
13 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/browser/manifest/manifest_icon_downloader.h" | 16 #include "chrome/browser/manifest/manifest_icon_downloader.h" |
16 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
17 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
18 #include "jni/ShortcutHelper_jni.h" | 19 #include "jni/ShortcutHelper_jni.h" |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 SkColorGetR(mean_color), SkColorGetG(mean_color), | 196 SkColorGetR(mean_color), SkColorGetG(mean_color), |
196 SkColorGetB(mean_color)); | 197 SkColorGetB(mean_color)); |
197 } | 198 } |
198 | 199 |
199 return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj())); | 200 return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj())); |
200 } | 201 } |
201 | 202 |
202 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { | 203 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { |
203 return RegisterNativesImpl(env); | 204 return RegisterNativesImpl(env); |
204 } | 205 } |
OLD | NEW |