diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_process_impl.h | 1 | ||||
| -rw-r--r-- | chrome/browser/find_in_page_controller_uitest.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 82f275f..5cfc375 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -176,6 +176,7 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe { // TODO(beng): remove once XPFrame/VistaFrame are gone. virtual bool IsUsingNewFrames() { DCHECK(CalledOnValidThread()); + return true; if (!checked_for_new_frames_) { using_new_frames_ = CommandLine().HasSwitch(L"magic_browzR"); checked_for_new_frames_ = true; diff --git a/chrome/browser/find_in_page_controller_uitest.cc b/chrome/browser/find_in_page_controller_uitest.cc index 0fd4012..c37870b 100644 --- a/chrome/browser/find_in_page_controller_uitest.cc +++ b/chrome/browser/find_in_page_controller_uitest.cc @@ -129,7 +129,8 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { scoped_ptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA->NavigateToURL(url)); - scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); + scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + //scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); ASSERT_TRUE(browser.get() != NULL); // Toggle the bookmark bar state. |