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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
index b1e7954ac72f9a24a53843b24a682275fa4ca4d0..85623e69f8abb660887a95a51671749988d4d568 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
@@ -11,14 +11,15 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.tab.ChromeTab;
import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.toolbar.ToolbarModel.ToolbarModelDelegate;
+//import org.chromium.chrome.browser.toolbar.ToolbarModel.ToolbarModelDelegate;
import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.content_public.browser.WebContents;
+//import org.chromium.content_public.browser.WebContents;
/**
* Contains the data and state for the toolbar.
*/
-class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, ToolbarModelDelegate {
+//class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, ToolbarModelDelegate {
+class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider {
private ChromeTab mTab;
private boolean mIsIncognito;
@@ -32,12 +33,14 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool
initialize(this);
}
+ /*
@Override
public WebContents getActiveWebContents() {
ChromeTab tab = getTab();
if (tab == null) return null;
return tab.getWebContents();
}
+ */
/**
* Sets the tab that contains the information to be displayed in the toolbar.

Powered by Google App Engine
This is Rietveld 408576698