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

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

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/popup_non_client_frame_view.h" 5 #include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h"
6 6
7 #include "chrome/browser/ui/views/frame/browser_frame.h" 7 #include "chrome/browser/ui/views/frame/browser_frame.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/gfx/point.h" 9 #include "ui/gfx/point.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 int PopupNonClientFrameView::NonClientHitTest(const gfx::Point& point) { 27 int PopupNonClientFrameView::NonClientHitTest(const gfx::Point& point) {
28 return bounds().Contains(point) ? HTCLIENT : HTNOWHERE; 28 return bounds().Contains(point) ? HTCLIENT : HTNOWHERE;
29 } 29 }
30 30
31 void PopupNonClientFrameView::GetWindowMask(const gfx::Size& size, 31 void PopupNonClientFrameView::GetWindowMask(const gfx::Size& size,
32 gfx::Path* window_mask) { 32 gfx::Path* window_mask) {
33 } 33 }
34 34
35 void PopupNonClientFrameView::EnableClose(bool enable) {
36 }
37
35 void PopupNonClientFrameView::ResetWindowControls() { 38 void PopupNonClientFrameView::ResetWindowControls() {
36 } 39 }
37 40
38 void PopupNonClientFrameView::UpdateWindowIcon() { 41 void PopupNonClientFrameView::UpdateWindowIcon() {
39 } 42 }
40 43
41 gfx::Rect PopupNonClientFrameView::GetBoundsForTabStrip( 44 gfx::Rect PopupNonClientFrameView::GetBoundsForTabStrip(
42 views::View* tabstrip) const { 45 views::View* tabstrip) const {
43 return gfx::Rect(0, 0, width(), tabstrip->GetPreferredSize().height()); 46 return gfx::Rect(0, 0, width(), tabstrip->GetPreferredSize().height());
44 } 47 }
45 48
46 int PopupNonClientFrameView::GetHorizontalTabStripVerticalOffset( 49 int PopupNonClientFrameView::GetHorizontalTabStripVerticalOffset(
47 bool restored) const { 50 bool restored) const {
48 return 0; 51 return 0;
49 } 52 }
50 53
51 void PopupNonClientFrameView::UpdateThrobber(bool running) { 54 void PopupNonClientFrameView::UpdateThrobber(bool running) {
52 } 55 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698