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

Side by Side Diff: chrome/browser/chromeos/frame/bubble_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/chromeos/frame/bubble_frame_view.h" 5 #include "chrome/browser/chromeos/frame/bubble_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/frame/bubble_window.h" 10 #include "chrome/browser/chromeos/frame/bubble_window.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 125
126 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) { 126 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
127 return HTNOWHERE; 127 return HTNOWHERE;
128 } 128 }
129 129
130 void BubbleFrameView::GetWindowMask(const gfx::Size& size, 130 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
131 gfx::Path* window_mask) { 131 gfx::Path* window_mask) {
132 } 132 }
133 133
134 void BubbleFrameView::EnableClose(bool enable) {
135 }
136
134 void BubbleFrameView::ResetWindowControls() { 137 void BubbleFrameView::ResetWindowControls() {
135 } 138 }
136 139
137 void BubbleFrameView::UpdateWindowIcon() { 140 void BubbleFrameView::UpdateWindowIcon() {
138 } 141 }
139 142
140 gfx::Insets BubbleFrameView::GetInsets() const { 143 gfx::Insets BubbleFrameView::GetInsets() const {
141 return (style_ & STYLE_FLUSH || style_ & STYLE_FLUSH_CONTENT) ? 144 return (style_ & STYLE_FLUSH || style_ & STYLE_FLUSH_CONTENT) ?
142 gfx::Insets() : 145 gfx::Insets() :
143 gfx::Insets(kTitleTopPadding, 146 gfx::Insets(kTitleTopPadding,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 canvas->GetSkCanvas()->drawPath(path, paint); 237 canvas->GetSkCanvas()->drawPath(path, paint);
235 } 238 }
236 239
237 void BubbleFrameView::ButtonPressed(views::Button* sender, 240 void BubbleFrameView::ButtonPressed(views::Button* sender,
238 const views::Event& event) { 241 const views::Event& event) {
239 if (close_button_ != NULL && sender == close_button_) 242 if (close_button_ != NULL && sender == close_button_)
240 GetWidget()->Close(); 243 GetWidget()->Close();
241 } 244 }
242 245
243 } // namespace chromeos 246 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698