chrome/browser/android/chrome_jni_registrar.cc - Issue 1264653005: Merge chrome/browser/android/bookmark[s] folders.

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

Issue 1264653005: Merge chrome/browser/android/bookmark[s] folders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile Created 5 years, 4 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

« no previous file with comments | « chrome/browser/android/bookmarks/edit_bookmark_helper.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_jni_registrar.h"	5 #include "chrome/browser/android/chrome_jni_registrar.h"

6	6

7 #include "base/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_registrar.h"	8 #include "base/android/jni_registrar.h"

9 #include "base/trace_event/trace_event.h"	9 #include "base/trace_event/trace_event.h"

10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"	10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"

11 #include "chrome/browser/android/accessibility_util.h"	11 #include "chrome/browser/android/accessibility_util.h"

12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"	12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"

13 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"	13 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"

14 #include "chrome/browser/android/banners/app_banner_manager_android.h"	14 #include "chrome/browser/android/banners/app_banner_manager_android.h"

15 #include "chrome/browser/android/bookmark/edit_bookmark_helper.h"

16 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"	15 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"

	16 #include "chrome/browser/android/bookmarks/edit_bookmark_helper.h"

17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"	17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"

18 #include "chrome/browser/android/chrome_application.h"	18 #include "chrome/browser/android/chrome_application.h"

19 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"	19 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"

20 #include "chrome/browser/android/compositor/compositor_view.h"	20 #include "chrome/browser/android/compositor/compositor_view.h"

21 #include "chrome/browser/android/compositor/layer_title_cache.h"	21 #include "chrome/browser/android/compositor/layer_title_cache.h"

22 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h"	22 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h"

23 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h"	23 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h"

24 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"	24 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"

25 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "	25 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "

26 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h"	26 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h"

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
315 };	315 };

316	316

317 bool RegisterBrowserJNI(JNIEnv* env) {	317 bool RegisterBrowserJNI(JNIEnv* env) {

318 TRACE_EVENT0("startup", "chrome_android::RegisterJni");	318 TRACE_EVENT0("startup", "chrome_android::RegisterJni");

319 return RegisterNativeMethods(env, kChromeRegisteredMethods,	319 return RegisterNativeMethods(env, kChromeRegisteredMethods,

320 arraysize(kChromeRegisteredMethods));	320 arraysize(kChromeRegisteredMethods));

321 }	321 }

322	322

323 } // namespace android	323 } // namespace android

324 } // namespace chrome	324 } // namespace chrome

OLD	NEW