summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 16:14:42 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 16:14:42 +0000
commit2a5f17632ca6af8fc6ac3c87c195a670a47ebe65 (patch)
treeb75d61239529c6eb8b3bf8b774b03829501edb15
parentdcc92de037ab853fabd21ccf4475a2623eabab41 (diff)
downloadchromium_src-2a5f17632ca6af8fc6ac3c87c195a670a47ebe65.zip
chromium_src-2a5f17632ca6af8fc6ac3c87c195a670a47ebe65.tar.gz
chromium_src-2a5f17632ca6af8fc6ac3c87c195a670a47ebe65.tar.bz2
Fix Chrome for Android build after r234502
TabModel class can't have pure virtual functions with no implementation in the private code. Added a stub implementation. TBR=dfalcantara@chromium.org BUG=265806 NOTRY=true Review URL: https://codereview.chromium.org/70403003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234535 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/android/tab_model/tab_model.cc4
-rw-r--r--chrome/browser/ui/android/tab_model/tab_model.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/ui/android/tab_model/tab_model.cc b/chrome/browser/ui/android/tab_model/tab_model.cc
index 9eb5f7a..84f574b 100644
--- a/chrome/browser/ui/android/tab_model/tab_model.cc
+++ b/chrome/browser/ui/android/tab_model/tab_model.cc
@@ -123,3 +123,7 @@ void TabModel::Observe(
NOTREACHED();
}
}
+
+content::WebContents* TabModel::CreateNewTabForDevTools(const GURL& url) {
+ return 0;
+}
diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h
index 60ac947..931700f 100644
--- a/chrome/browser/ui/android/tab_model/tab_model.h
+++ b/chrome/browser/ui/android/tab_model/tab_model.h
@@ -58,7 +58,7 @@ class TabModel : public content::NotificationObserver,
// Used by Developer Tools to create a new tab with a given URL.
// Replaces CreateTabForTesting.
- virtual content::WebContents* CreateNewTabForDevTools(const GURL& url) = 0;
+ virtual content::WebContents* CreateNewTabForDevTools(const GURL& url);
// Return true if we are currently restoring sessions asynchronously.
virtual bool IsSessionRestoreInProgress() const = 0;