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

Unified Diff: chrome/browser/extensions/extension_sidebar_api.cc

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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/browser/extensions/extension_sidebar_api.cc
===================================================================
--- chrome/browser/extensions/extension_sidebar_api.cc (revision 66453)
+++ chrome/browser/extensions/extension_sidebar_api.cc (working copy)
@@ -16,6 +16,7 @@
#include "chrome/browser/sidebar/sidebar_container.h"
#include "chrome/browser/sidebar/sidebar_manager.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_error_utils.h"
@@ -122,7 +123,7 @@
}
int tab_id;
- TabContents* tab_contents = NULL;
+ TabContentsWrapper* tab_contents = NULL;
if (details->HasKey(kTabIdKey)) {
EXTENSION_FUNCTION_VALIDATE(details->GetInteger(kTabIdKey, &tab_id));
if (!ExtensionTabUtil::GetTabById(tab_id, profile(), include_incognito(),
@@ -146,7 +147,7 @@
return false;
std::string content_id(GetExtension()->id());
- return RunImpl(tab_contents, content_id, *details);
+ return RunImpl(tab_contents->tab_contents(), content_id, *details);
}
@@ -193,7 +194,7 @@
// Check if this tab is selected.
Browser* browser = GetCurrentBrowser();
- TabContents* contents = NULL;
+ TabContentsWrapper* contents = NULL;
int default_tab_id = -1;
if (browser &&
ExtensionTabUtil::GetDefaultTab(browser, &contents,

Powered by Google App Engine
This is Rietveld 408576698