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

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: Fixed messed up indentation Created 8 years, 6 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after
2426 this, 2427 this,
2427 web_contents->GetRenderViewHost(), 2428 web_contents->GetRenderViewHost(),
2428 password_generator, 2429 password_generator,
2429 browser_.get(), 2430 browser_.get(),
2430 wrapper->password_manager()); 2431 wrapper->password_manager());
2431 2432
2432 views::BubbleDelegateView::CreateBubble(bubble); 2433 views::BubbleDelegateView::CreateBubble(bubble);
2433 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); 2434 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
2434 bubble->Show(); 2435 bubble->Show();
2435 } 2436 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698