| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/vista_frame.h" | 5 #include "chrome/browser/vista_frame.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <atlbase.h> | 8 #include <atlbase.h> |
| 9 #include <atlapp.h> | 9 #include <atlapp.h> |
| 10 #include <atltheme.h> | 10 #include <atltheme.h> |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 void VistaFrame::UpdateToolbar(TabContents* contents, | 642 void VistaFrame::UpdateToolbar(TabContents* contents, |
| 643 bool should_restore_state) { | 643 bool should_restore_state) { |
| 644 } | 644 } |
| 645 | 645 |
| 646 void VistaFrame::ProfileChanged(Profile* profile) { | 646 void VistaFrame::ProfileChanged(Profile* profile) { |
| 647 } | 647 } |
| 648 | 648 |
| 649 void VistaFrame::FocusToolbar() { | 649 void VistaFrame::FocusToolbar() { |
| 650 } | 650 } |
| 651 | 651 |
| 652 bool VistaFrame::IsBookmarkBarVisible() const { |
| 653 if (!bookmark_bar_view_.get()) |
| 654 return false; |
| 655 |
| 656 if (bookmark_bar_view_->IsNewTabPage() || bookmark_bar_view_->IsAnimating()) |
| 657 return true; |
| 658 |
| 659 CSize sz; |
| 660 bookmark_bar_view_->GetPreferredSize(&sz); |
| 661 // 1 is the minimum in GetPreferredSize for the bookmark bar. |
| 662 return sz.cy > 1; |
| 663 } |
| 664 |
| 652 //////////////////////////////////////////////////////////////////////////////// | 665 //////////////////////////////////////////////////////////////////////////////// |
| 653 // | 666 // |
| 654 // Events | 667 // Events |
| 655 // | 668 // |
| 656 //////////////////////////////////////////////////////////////////////////////// | 669 //////////////////////////////////////////////////////////////////////////////// |
| 657 | 670 |
| 658 LRESULT VistaFrame::OnSettingChange(UINT u_msg, WPARAM w_param, LPARAM l_param, | 671 LRESULT VistaFrame::OnSettingChange(UINT u_msg, WPARAM w_param, LPARAM l_param, |
| 659 BOOL& handled) { | 672 BOOL& handled) { |
| 660 // Set this to false, if we actually handle the message, we'll set it to | 673 // Set this to false, if we actually handle the message, we'll set it to |
| 661 // true below. | 674 // true below. |
| (...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1604 | 1617 |
| 1605 // Only do a layout if the current contents is non-null. We assume that if the | 1618 // Only do a layout if the current contents is non-null. We assume that if the |
| 1606 // contents is NULL, we're either being destroyed, or ShowTabContents is going | 1619 // contents is NULL, we're either being destroyed, or ShowTabContents is going |
| 1607 // to be invoked with a non-null TabContents again so that there is no need | 1620 // to be invoked with a non-null TabContents again so that there is no need |
| 1608 // in doing a layout now (and would result in extra work/invalidation on | 1621 // in doing a layout now (and would result in extra work/invalidation on |
| 1609 // tab switches). | 1622 // tab switches). |
| 1610 if (changed && current_tab) | 1623 if (changed && current_tab) |
| 1611 Layout(); | 1624 Layout(); |
| 1612 } | 1625 } |
| 1613 | 1626 |
| OLD | NEW |