diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-14 22:50:33 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-14 22:50:33 +0000 |
| commit | a9f3bf6312aba4689d8b60bd13069b281453e6e1 (patch) | |
| tree | f4e85a5dd17fa6436d8054cf6cd11fb3051cb946 /chrome/browser | |
| parent | 7bb9eb3fe659f6e04f98fc3cb22745cdd0ce62a6 (diff) | |
| download | chromium_src-a9f3bf6312aba4689d8b60bd13069b281453e6e1.zip chromium_src-a9f3bf6312aba4689d8b60bd13069b281453e6e1.tar.gz chromium_src-a9f3bf6312aba4689d8b60bd13069b281453e6e1.tar.bz2 | |
Revert these changes now the experiment is complete.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2208 0039d316-1c4b-4281-b951-d872f2087c98
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, 1 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 5cfc375..82f275f 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -176,7 +176,6 @@ 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 c37870b..0fd4012 100644 --- a/chrome/browser/find_in_page_controller_uitest.cc +++ b/chrome/browser/find_in_page_controller_uitest.cc @@ -129,8 +129,7 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { scoped_ptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA->NavigateToURL(url)); - scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); - //scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); + scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); ASSERT_TRUE(browser.get() != NULL); // Toggle the bookmark bar state. |