OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 | 708 |
709 void BrowserView::ShowZoomBubble(int zoom_percent) { | 709 void BrowserView::ShowZoomBubble(int zoom_percent) { |
710 GetLocationBarView()->ShowZoomBubble(zoom_percent); | 710 GetLocationBarView()->ShowZoomBubble(zoom_percent); |
711 } | 711 } |
712 | 712 |
713 gfx::Rect BrowserView::GetRestoredBounds() const { | 713 gfx::Rect BrowserView::GetRestoredBounds() const { |
714 return frame_->GetRestoredBounds(); | 714 return frame_->GetRestoredBounds(); |
715 } | 715 } |
716 | 716 |
717 gfx::Rect BrowserView::GetBounds() const { | 717 gfx::Rect BrowserView::GetBounds() const { |
718 return frame_->GetWindowScreenBounds(); | 718 return frame_->GetWindowBoundsInScreen(); |
719 } | 719 } |
720 | 720 |
721 bool BrowserView::IsMaximized() const { | 721 bool BrowserView::IsMaximized() const { |
722 return frame_->IsMaximized(); | 722 return frame_->IsMaximized(); |
723 } | 723 } |
724 | 724 |
725 bool BrowserView::IsMinimized() const { | 725 bool BrowserView::IsMinimized() const { |
726 return frame_->IsMinimized(); | 726 return frame_->IsMinimized(); |
727 } | 727 } |
728 | 728 |
(...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2565 bubble->Show(); | 2565 bubble->Show(); |
2566 } | 2566 } |
2567 | 2567 |
2568 void BrowserView::RestackLocationBarContainer() { | 2568 void BrowserView::RestackLocationBarContainer() { |
2569 #if defined(USE_AURA) | 2569 #if defined(USE_AURA) |
2570 if (search_view_controller_.get()) | 2570 if (search_view_controller_.get()) |
2571 search_view_controller_->StackAtTop(); | 2571 search_view_controller_->StackAtTop(); |
2572 #endif | 2572 #endif |
2573 toolbar_->location_bar_container()->StackAtTop(); | 2573 toolbar_->location_bar_container()->StackAtTop(); |
2574 } | 2574 } |
OLD | NEW |