| 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 // Loads are now complete, update the state if a task was scheduled. | 717 // Loads are now complete, update the state if a task was scheduled. |
| 718 LoadingAnimationCallback(); | 718 LoadingAnimationCallback(); |
| 719 } | 719 } |
| 720 } | 720 } |
| 721 } | 721 } |
| 722 | 722 |
| 723 void BrowserView::SetStarredState(bool is_starred) { | 723 void BrowserView::SetStarredState(bool is_starred) { |
| 724 GetLocationBarView()->SetStarToggled(is_starred); | 724 GetLocationBarView()->SetStarToggled(is_starred); |
| 725 } | 725 } |
| 726 | 726 |
| 727 void BrowserView::SetZoomIconState(ZoomController::ZoomIconState state) { | 727 void BrowserView::SetZoomIconState( |
| 728 // TODO(khorimoto): Implement this. | 728 ZoomController::ZoomIconState zoom_icon_state) { |
| 729 GetLocationBarView()->SetZoomIconState(zoom_icon_state); |
| 729 } | 730 } |
| 730 | 731 |
| 731 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { | 732 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { |
| 732 // TODO(khorimoto): Implement this. | 733 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent); |
| 733 } | 734 } |
| 734 | 735 |
| 735 void BrowserView::ShowZoomBubble(int zoom_percent) { | 736 void BrowserView::ShowZoomBubble(int zoom_percent) { |
| 736 // TODO(khorimoto): Implement this. | 737 GetLocationBarView()->ShowZoomBubble(zoom_percent); |
| 737 } | 738 } |
| 738 | 739 |
| 739 gfx::Rect BrowserView::GetRestoredBounds() const { | 740 gfx::Rect BrowserView::GetRestoredBounds() const { |
| 740 return frame_->GetRestoredBounds(); | 741 return frame_->GetRestoredBounds(); |
| 741 } | 742 } |
| 742 | 743 |
| 743 gfx::Rect BrowserView::GetBounds() const { | 744 gfx::Rect BrowserView::GetBounds() const { |
| 744 return frame_->GetWindowScreenBounds(); | 745 return frame_->GetWindowScreenBounds(); |
| 745 } | 746 } |
| 746 | 747 |
| (...skipping 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2424 form, | 2425 form, |
| 2425 this, | 2426 this, |
| 2426 web_contents->GetRenderViewHost(), | 2427 web_contents->GetRenderViewHost(), |
| 2427 browser_.get(), | 2428 browser_.get(), |
| 2428 wrapper->password_manager()); | 2429 wrapper->password_manager()); |
| 2429 | 2430 |
| 2430 views::BubbleDelegateView::CreateBubble(bubble); | 2431 views::BubbleDelegateView::CreateBubble(bubble); |
| 2431 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2432 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2432 bubble->Show(); | 2433 bubble->Show(); |
| 2433 } | 2434 } |
| OLD | NEW |