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

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (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
« no previous file with comments | « chrome/browser/crash_recovery_browsertest.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
===================================================================
--- chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc (revision 145001)
+++ chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc (working copy)
@@ -10,6 +10,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/tab_contents/render_view_context_menu.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/navigation_controller.h"
@@ -51,7 +52,7 @@
params.media_type = WebKit::WebContextMenuData::MediaTypeNone;
params.link_url = url;
params.unfiltered_link_url = url;
- WebContents* web_contents = browser()->GetActiveWebContents();
+ WebContents* web_contents = chrome::GetActiveWebContents(browser());
params.page_url = web_contents->GetController().GetActiveEntry()->GetURL();
#if defined(OS_MACOSX)
params.writing_direction_default = 0;
@@ -59,7 +60,7 @@
params.writing_direction_right_to_left = 0;
#endif // OS_MACOSX
TestRenderViewContextMenu* menu = new TestRenderViewContextMenu(
- browser()->GetActiveWebContents(), params);
+ chrome::GetActiveWebContents(browser()), params);
menu->Init();
return menu;
}
@@ -107,5 +108,5 @@
ui_test_utils::NavigateToURL(browser(), GURL("foo:test"));
- ASSERT_EQ(handler_url, browser()->GetActiveWebContents()->GetURL());
+ ASSERT_EQ(handler_url, chrome::GetActiveWebContents(browser())->GetURL());
}
« no previous file with comments | « chrome/browser/crash_recovery_browsertest.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698