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

Unified Diff: chrome/browser/unload_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/ui/webui/web_ui_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/unload_browsertest.cc
===================================================================
--- chrome/browser/unload_browsertest.cc (revision 145001)
+++ chrome/browser/unload_browsertest.cc (working copy)
@@ -16,6 +16,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -128,7 +129,7 @@
void CheckTitle(const char* expected_title) {
string16 expected = ASCIIToUTF16(expected_title);
- EXPECT_EQ(expected, browser()->GetActiveWebContents()->GetTitle());
+ EXPECT_EQ(expected, chrome::GetActiveWebContents(browser())->GetTitle());
}
void NavigateToDataURL(const std::string& html_content,
@@ -275,7 +276,7 @@
// the renderer.
string16 expected_title = ASCIIToUTF16("cancelled");
ui_test_utils::TitleWatcher title_watcher(
- browser()->GetActiveWebContents(), expected_title);
+ chrome::GetActiveWebContents(browser()), expected_title);
ClickModalDialogButton(false);
ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle());
@@ -390,7 +391,7 @@
ui_test_utils::WindowedNotificationObserver load_stop_observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
- ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
+ ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
observer.Wait();
load_stop_observer.Wait();
CheckTitle("popup");
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698