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

Unified Diff: chrome/browser/ui/views/ash/user_action_handler.cc

Issue 10540100: TabContentsWrapper -> TabContents, part 48. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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/browser/ui/views/ash/user_action_handler.cc
diff --git a/chrome/browser/ui/views/ash/user_action_handler.cc b/chrome/browser/ui/views/ash/user_action_handler.cc
index f1efa93e93b6cf1e239e0a8c4d94eb16621d00e6..b4b77a271d1a7c6e9b0df6dd8ce139fc7a70b0d9 100644
--- a/chrome/browser/ui/views/ash/user_action_handler.cc
+++ b/chrome/browser/ui/views/ash/user_action_handler.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "content/public/browser/web_contents.h"
// Returns the currently-active WebContents belonging to the active browser, or
@@ -20,10 +20,7 @@ content::WebContents* GetActiveWebContents() {
if (!ash::wm::IsActiveWindow(browser->window()->GetNativeWindow()))
return NULL;
- TabContentsWrapper* wrapper = browser->GetSelectedTabContentsWrapper();
- if (!wrapper)
- return NULL;
- return wrapper->web_contents();
+ return browser->GetActiveWebContents();
}
UserActionHandler::UserActionHandler() {}
« no previous file with comments | « chrome/browser/ui/views/ash/panel_view_aura.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698