| 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 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 // Loads are now complete, update the state if a task was scheduled. | 682 // Loads are now complete, update the state if a task was scheduled. |
| 683 LoadingAnimationCallback(); | 683 LoadingAnimationCallback(); |
| 684 } | 684 } |
| 685 } | 685 } |
| 686 } | 686 } |
| 687 | 687 |
| 688 void BrowserView::SetStarredState(bool is_starred) { | 688 void BrowserView::SetStarredState(bool is_starred) { |
| 689 GetLocationBarView()->SetStarToggled(is_starred); | 689 GetLocationBarView()->SetStarToggled(is_starred); |
| 690 } | 690 } |
| 691 | 691 |
| 692 void BrowserView::SetZoomIconState(ZoomController::ZoomIconState state) { | 692 void BrowserView::SetZoomIconState( |
| 693 // TODO(khorimoto): Implement this. | 693 ZoomController::ZoomIconState zoom_icon_state) { |
| 694 GetLocationBarView()->SetZoomIconState(zoom_icon_state); |
| 694 } | 695 } |
| 695 | 696 |
| 696 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { | 697 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { |
| 697 // TODO(khorimoto): Implement this. | 698 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent); |
| 698 } | 699 } |
| 699 | 700 |
| 700 void BrowserView::ShowZoomBubble(int zoom_percent) { | 701 void BrowserView::ShowZoomBubble(int zoom_percent) { |
| 701 // TODO(khorimoto): Implement this. | 702 GetLocationBarView()->ShowZoomBubble(zoom_percent); |
| 702 } | 703 } |
| 703 | 704 |
| 704 gfx::Rect BrowserView::GetRestoredBounds() const { | 705 gfx::Rect BrowserView::GetRestoredBounds() const { |
| 705 return frame_->GetRestoredBounds(); | 706 return frame_->GetRestoredBounds(); |
| 706 } | 707 } |
| 707 | 708 |
| 708 gfx::Rect BrowserView::GetBounds() const { | 709 gfx::Rect BrowserView::GetBounds() const { |
| 709 return frame_->GetWindowScreenBounds(); | 710 return frame_->GetWindowScreenBounds(); |
| 710 } | 711 } |
| 711 | 712 |
| (...skipping 1800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2512 bubble->Show(); | 2513 bubble->Show(); |
| 2513 } | 2514 } |
| 2514 | 2515 |
| 2515 void BrowserView::RestackLocationBarContainer() { | 2516 void BrowserView::RestackLocationBarContainer() { |
| 2516 #if defined(USE_AURA) | 2517 #if defined(USE_AURA) |
| 2517 if (search_view_controller_.get()) | 2518 if (search_view_controller_.get()) |
| 2518 search_view_controller_->StackAtTop(); | 2519 search_view_controller_->StackAtTop(); |
| 2519 #endif | 2520 #endif |
| 2520 toolbar_->location_bar_container()->StackAtTop(); | 2521 toolbar_->location_bar_container()->StackAtTop(); |
| 2521 } | 2522 } |
| OLD | NEW |