| 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 // Loads are now complete, update the state if a task was scheduled. | 692 // Loads are now complete, update the state if a task was scheduled. |
| 693 LoadingAnimationCallback(); | 693 LoadingAnimationCallback(); |
| 694 } | 694 } |
| 695 } | 695 } |
| 696 } | 696 } |
| 697 | 697 |
| 698 void BrowserView::SetStarredState(bool is_starred) { | 698 void BrowserView::SetStarredState(bool is_starred) { |
| 699 GetLocationBarView()->SetStarToggled(is_starred); | 699 GetLocationBarView()->SetStarToggled(is_starred); |
| 700 } | 700 } |
| 701 | 701 |
| 702 #if defined(OS_WIN) |
| 703 void BrowserView::SetMetroPinnedState(bool is_pinned) { |
| 704 GetLocationBarView()->SetMetroPinnedState(is_pinned); |
| 705 } |
| 706 #endif |
| 707 |
| 702 void BrowserView::SetZoomIconState( | 708 void BrowserView::SetZoomIconState( |
| 703 ZoomController::ZoomIconState zoom_icon_state) { | 709 ZoomController::ZoomIconState zoom_icon_state) { |
| 704 GetLocationBarView()->SetZoomIconState(zoom_icon_state); | 710 GetLocationBarView()->SetZoomIconState(zoom_icon_state); |
| 705 } | 711 } |
| 706 | 712 |
| 707 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { | 713 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { |
| 708 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent); | 714 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent); |
| 709 } | 715 } |
| 710 | 716 |
| 711 void BrowserView::ShowZoomBubble(int zoom_percent) { | 717 void BrowserView::ShowZoomBubble(int zoom_percent) { |
| (...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2583 if (contents && contents->GetContentNativeView() && | 2589 if (contents && contents->GetContentNativeView() && |
| 2584 contents->GetContentNativeView()->HasFocus()) { | 2590 contents->GetContentNativeView()->HasFocus()) { |
| 2585 (contents->GetRenderViewHost()->*method)(); | 2591 (contents->GetRenderViewHost()->*method)(); |
| 2586 return true; | 2592 return true; |
| 2587 } | 2593 } |
| 2588 #elif defined(OS_WIN) | 2594 #elif defined(OS_WIN) |
| 2589 // TODO(yusukes): Support non-Aura Windows. | 2595 // TODO(yusukes): Support non-Aura Windows. |
| 2590 #endif | 2596 #endif |
| 2591 return false; | 2597 return false; |
| 2592 } | 2598 } |
| OLD | NEW |