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

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

Issue 16336027: Enable high dpi in win/views. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove some extraneous code. Created 7 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 void BrowserView::SetStarredState(bool is_starred) { 822 void BrowserView::SetStarredState(bool is_starred) {
823 GetLocationBarView()->SetStarToggled(is_starred); 823 GetLocationBarView()->SetStarToggled(is_starred);
824 } 824 }
825 825
826 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) { 826 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
827 GetLocationBarView()->ZoomChangedForActiveTab( 827 GetLocationBarView()->ZoomChangedForActiveTab(
828 can_show_bubble && !toolbar_->IsWrenchMenuShowing()); 828 can_show_bubble && !toolbar_->IsWrenchMenuShowing());
829 } 829 }
830 830
831 gfx::Rect BrowserView::GetRestoredBounds() const { 831 gfx::Rect BrowserView::GetRestoredBounds() const {
832 return frame_->GetRestoredBounds(); 832 return frame_->GetRestoredBounds();
kevers 2013/06/06 13:32:33 whitespace change?
girard 2013/06/10 14:27:56 No idea. I've reverted this.
833 } 833 }
834 834
835 ui::WindowShowState BrowserView::GetRestoredState() const { 835 ui::WindowShowState BrowserView::GetRestoredState() const {
836 if (IsMaximized()) 836 if (IsMaximized())
837 return ui::SHOW_STATE_MAXIMIZED; 837 return ui::SHOW_STATE_MAXIMIZED;
838 if (IsMinimized()) 838 if (IsMinimized())
839 return ui::SHOW_STATE_MINIMIZED; 839 return ui::SHOW_STATE_MINIMIZED;
840 return ui::SHOW_STATE_NORMAL; 840 return ui::SHOW_STATE_NORMAL;
841 } 841 }
842 842
(...skipping 1923 matching lines...) Expand 10 before | Expand all | Expand 10 after
2766 // The +1 in the next line creates a 1-px gap between icon and arrow tip. 2766 // The +1 in the next line creates a 1-px gap between icon and arrow tip.
2767 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - 2767 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
2768 LocationBarView::kIconInternalPadding + 1); 2768 LocationBarView::kIconInternalPadding + 1);
2769 ConvertPointToTarget(location_icon_view, this, &icon_bottom); 2769 ConvertPointToTarget(location_icon_view, this, &icon_bottom);
2770 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2770 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2771 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2771 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2772 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2772 top_arrow_height = infobar_top.y() - icon_bottom.y();
2773 } 2773 }
2774 return top_arrow_height; 2774 return top_arrow_height;
2775 } 2775 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698