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

Unified Diff: chrome/browser/views/frame/browser_view.cc

Issue 27247: Non-functional cleanup:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/frame/browser_view.h ('k') | chrome/browser/views/frame/opaque_non_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc (revision 10517)
+++ chrome/browser/views/frame/browser_view.cc (working copy)
@@ -126,15 +126,15 @@
class ResizeCorner : public views::View {
public:
- ResizeCorner(const BrowserWindow* parent)
+ explicit ResizeCorner(const BrowserView* parent)
: parent_(parent) {
}
virtual void Paint(ChromeCanvas* canvas) {
- if (parent_ && (parent_->IsMaximized() || parent_->IsFullscreen()))
+ if (parent_ && !parent_->CanCurrentlyResize())
return;
- SkBitmap * bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
IDR_TEXTAREA_RESIZER);
bitmap->buildMipMap(false);
bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
@@ -144,20 +144,19 @@
canvas->save();
}
canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
- height() - bitmap->height());
+ height() - bitmap->height());
if (rtl_dir)
canvas->restore();
}
static gfx::Size GetSize() {
return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
- views::NativeScrollBar::GetHorizontalScrollBarHeight());
+ views::NativeScrollBar::GetHorizontalScrollBarHeight());
}
virtual gfx::Size GetPreferredSize() {
- if (parent_ && (parent_->IsMaximized() || parent_->IsFullscreen()))
- return gfx::Size();
- return GetSize();
+ return (parent_ && !parent_->CanCurrentlyResize()) ?
+ gfx::Size() : GetSize();
}
virtual void Layout() {
@@ -167,12 +166,12 @@
// No need to handle Right to left text direction here,
// our parent must take care of it for us...
SetBounds(parent_view->width() - ps.width(),
- parent_view->height() - ps.height(), ps.width(), ps.height());
+ parent_view->height() - ps.height(), ps.width(), ps.height());
}
}
private:
- const BrowserWindow* parent_;
+ const BrowserView* parent_;
DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
};
@@ -260,6 +259,10 @@
tab_contents->AsWebContents()->WindowMoveOrResizeStarted();
}
+bool BrowserView::CanCurrentlyResize() const {
+ return !IsMaximized() && !IsFullscreen();
+}
+
gfx::Rect BrowserView::GetToolbarBounds() const {
return toolbar_->bounds();
}
@@ -713,8 +716,7 @@
}
gfx::Rect BrowserView::GetRootWindowResizerRect() const {
- // There is no resize corner when we are maximized or full screen
- if (IsMaximized() || IsFullscreen())
+ if (!CanCurrentlyResize())
return gfx::Rect();
// We don't specify a resize corner size if we have a bottom shelf either.
@@ -1106,8 +1108,7 @@
// area of the window. So we need to treat hit-tests in these regions as
// hit-tests of the titlebar.
- // There is not resize corner when we are maximised
- if (!IsMaximized() && !IsFullscreen()) {
+ if (CanCurrentlyResize()) {
CRect client_rect;
::GetClientRect(frame_->GetWindow()->GetHWND(), &client_rect);
gfx::Size resize_corner_size = ResizeCorner::GetSize();
« no previous file with comments | « chrome/browser/views/frame/browser_view.h ('k') | chrome/browser/views/frame/opaque_non_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698