Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10494004: Implements a zoom icon in the Omnibox for Views. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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(ZoomController::ZoomIconState state) { 701 void BrowserView::SetZoomIconState(
702 // TODO(khorimoto): Implement this. 702 ZoomController::ZoomIconState zoom_icon_state) {
703 GetLocationBarView()->SetZoomIconState(zoom_icon_state);
703 } 704 }
704 705
705 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) { 706 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) {
706 // TODO(khorimoto): Implement this. 707 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent);
707 } 708 }
708 709
709 void BrowserView::ShowZoomBubble(int zoom_percent) { 710 void BrowserView::ShowZoomBubble(int zoom_percent) {
710 // TODO(khorimoto): Implement this. 711 GetLocationBarView()->ShowZoomBubble(zoom_percent);
711 } 712 }
712 713
713 gfx::Rect BrowserView::GetRestoredBounds() const { 714 gfx::Rect BrowserView::GetRestoredBounds() const {
714 return frame_->GetRestoredBounds(); 715 return frame_->GetRestoredBounds();
715 } 716 }
716 717
717 gfx::Rect BrowserView::GetBounds() const { 718 gfx::Rect BrowserView::GetBounds() const {
718 return frame_->GetWindowScreenBounds(); 719 return frame_->GetWindowScreenBounds();
719 } 720 }
720 721
(...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 bubble->Show(); 2569 bubble->Show();
2569 } 2570 }
2570 2571
2571 void BrowserView::RestackLocationBarContainer() { 2572 void BrowserView::RestackLocationBarContainer() {
2572 #if defined(USE_AURA) 2573 #if defined(USE_AURA)
2573 if (search_view_controller_.get()) 2574 if (search_view_controller_.get())
2574 search_view_controller_->StackAtTop(); 2575 search_view_controller_->StackAtTop();
2575 #endif 2576 #endif
2576 toolbar_->location_bar_container()->StackAtTop(); 2577 toolbar_->location_bar_container()->StackAtTop();
2577 } 2578 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698