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

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 1326643003: Overlay content is its own class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-panel-functionality
Patch Set: flip booleans for testing renamed api Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/bottombar/overlay_panel_content.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index c061769ac72688099b698dd22bb1a15384d2d4af..7a803fc5a40f5858c878e9be8f7c0b93c5628dba 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
#include "chrome/browser/android/bookmarks/edit_bookmark_helper.h"
#include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
-#include "chrome/browser/android/bottombar/contextualsearch/contextual_search_panel.h"
+#include "chrome/browser/android/bottombar/overlay_panel_content.h"
#include "chrome/browser/android/chrome_application.h"
#include "chrome/browser/android/chrome_web_contents_delegate_android.h"
#include "chrome/browser/android/compositor/compositor_view.h"
@@ -226,7 +226,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"ConnectivityChecker", RegisterConnectivityChecker},
{"ContextMenuHelper", RegisterContextMenuHelper},
{"ContextualSearchManager", RegisterContextualSearchManager},
- {"ContextualSearchPanel", RegisterContextualSearchPanel},
{"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer},
{"ContextualSearchTabHelper", RegisterContextualSearchTabHelper},
{"CookiesFetcher", RegisterCookiesFetcher},
@@ -284,6 +283,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"OmniboxUrlEmphasizer",
OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
{"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
+ {"OverlayPanelContent", RegisterOverlayPanelContent},
{"PlatformUtil", platform_util::RegisterPlatformUtil},
{"PartnerBookmarksReader",
PartnerBookmarksReader::RegisterPartnerBookmarksReader},
« no previous file with comments | « chrome/browser/android/bottombar/overlay_panel_content.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698