diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 00:22:27 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 00:22:27 +0000 |
commit | 7db6002e2322817d245227b53aa3b3e4bd7212af (patch) | |
tree | fb8d54ab45cb5217a5bcf5ecf9ce79110ccf5f14 /chrome/browser/browser.cc | |
parent | 409204e90f7bcc1bbbbb8ef0dba2d97d57df10f0 (diff) | |
download | chromium_src-7db6002e2322817d245227b53aa3b3e4bd7212af.zip chromium_src-7db6002e2322817d245227b53aa3b3e4bd7212af.tar.gz chromium_src-7db6002e2322817d245227b53aa3b3e4bd7212af.tar.bz2 |
Revert r30541 since it's still breaking browser_tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 74652e7..619e855 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1600,8 +1600,7 @@ void Browser::DuplicateContentsAt(int index) { } else { Browser* browser = NULL; if (type_ & TYPE_APP) { - browser = Browser::CreateForApp(app_name_, profile_, - !!(type_ & TYPE_POPUP)); + browser = Browser::CreateForApp(app_name_, profile_, type_ & TYPE_POPUP); } else if (type_ == TYPE_POPUP) { browser = Browser::CreateForPopup(profile_); } @@ -1958,7 +1957,7 @@ void Browser::DetachContents(TabContents* source) { bool Browser::IsPopup(TabContents* source) { // A non-tabbed BROWSER is an unconstrained popup. - return !!(type() & TYPE_POPUP); + return (type() & TYPE_POPUP); } void Browser::ToolbarSizeChanged(TabContents* source, bool is_animating) { |