| 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 // Loads are now complete, update the state if a task was scheduled. | 691 // Loads are now complete, update the state if a task was scheduled. |
| 692 LoadingAnimationCallback(); | 692 LoadingAnimationCallback(); |
| 693 } | 693 } |
| 694 } | 694 } |
| 695 } | 695 } |
| 696 | 696 |
| 697 void BrowserView::SetStarredState(bool is_starred) { | 697 void BrowserView::SetStarredState(bool is_starred) { |
| 698 GetLocationBarView()->SetStarToggled(is_starred); | 698 GetLocationBarView()->SetStarToggled(is_starred); |
| 699 } | 699 } |
| 700 | 700 |
| 701 void BrowserView::SetZoomIconState( | 701 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) { |
| 702 ZoomController::ZoomIconState zoom_icon_state) { | 702 GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble); |
| 703 GetLocationBarView()->SetZoomIconState(zoom_icon_state); | |
| 704 } | |
| 705 | |
| 706 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { | |
| 707 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent); | |
| 708 } | |
| 709 | |
| 710 void BrowserView::ShowZoomBubble(int zoom_percent) { | |
| 711 GetLocationBarView()->ShowZoomBubble(zoom_percent); | |
| 712 } | 703 } |
| 713 | 704 |
| 714 gfx::Rect BrowserView::GetRestoredBounds() const { | 705 gfx::Rect BrowserView::GetRestoredBounds() const { |
| 715 return frame_->GetRestoredBounds(); | 706 return frame_->GetRestoredBounds(); |
| 716 } | 707 } |
| 717 | 708 |
| 718 gfx::Rect BrowserView::GetBounds() const { | 709 gfx::Rect BrowserView::GetBounds() const { |
| 719 return frame_->GetWindowScreenBounds(); | 710 return frame_->GetWindowScreenBounds(); |
| 720 } | 711 } |
| 721 | 712 |
| (...skipping 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2565 bubble->Show(); | 2556 bubble->Show(); |
| 2566 } | 2557 } |
| 2567 | 2558 |
| 2568 void BrowserView::RestackLocationBarContainer() { | 2559 void BrowserView::RestackLocationBarContainer() { |
| 2569 #if defined(USE_AURA) | 2560 #if defined(USE_AURA) |
| 2570 if (search_view_controller_.get()) | 2561 if (search_view_controller_.get()) |
| 2571 search_view_controller_->StackAtTop(); | 2562 search_view_controller_->StackAtTop(); |
| 2572 #endif | 2563 #endif |
| 2573 toolbar_->location_bar_container()->StackAtTop(); | 2564 toolbar_->location_bar_container()->StackAtTop(); |
| 2574 } | 2565 } |
| OLD | NEW |