Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java |
index 31afa32321d045d55cccc3ae73c61052c75bb06a..5655bfca23f2226fd0cdca979f892f20e80083aa 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java |
@@ -42,10 +42,10 @@ public class ToolbarModel { |
mNativeToolbarModelAndroid = 0; |
} |
- /** @return The search terms extracted from the current url if query extraction is enabled. */ |
- public String getSearchTerms() { |
+ /** @return The formatted text (URL or search terms) for display. */ |
+ public String getText() { |
if (mNativeToolbarModelAndroid == 0) return null; |
- return nativeGetSearchTerms(mNativeToolbarModelAndroid); |
+ return nativeGetText(mNativeToolbarModelAndroid); |
} |
/** @return The parameter in the url that triggers query extraction. */ |
@@ -62,7 +62,7 @@ public class ToolbarModel { |
private native long nativeInit(ToolbarModelDelegate delegate); |
private native void nativeDestroy(long nativeToolbarModelAndroid); |
- private native String nativeGetSearchTerms(long nativeToolbarModelAndroid); |
+ private native String nativeGetText(long nativeToolbarModelAndroid); |
private native String nativeGetQueryExtractionParam(long nativeToolbarModelAndroid); |
private native String nativeGetCorpusChipText(long nativeToolbarModelAndroid); |
} |