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

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

Issue 10821002: Makes the min window size include the OTR image and caption buttons on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 8 years, 5 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 | Annotate | Revision Log
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/app_non_client_frame_view_aura.h" 5 #include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
6 6
7 #include "base/debug/stack_trace.h" 7 #include "base/debug/stack_trace.h"
8 #include "chrome/browser/ui/views/frame/browser_frame.h" 8 #include "chrome/browser/ui/views/frame/browser_frame.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "grit/generated_resources.h" // Accessibility names 10 #include "grit/generated_resources.h" // Accessibility names
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } 227 }
228 228
229 void AppNonClientFrameViewAura::UpdateWindowIcon() { 229 void AppNonClientFrameViewAura::UpdateWindowIcon() {
230 } 230 }
231 231
232 gfx::Rect AppNonClientFrameViewAura::GetBoundsForTabStrip( 232 gfx::Rect AppNonClientFrameViewAura::GetBoundsForTabStrip(
233 views::View* tabstrip) const { 233 views::View* tabstrip) const {
234 return gfx::Rect(); 234 return gfx::Rect();
235 } 235 }
236 236
237 int AppNonClientFrameViewAura::GetHorizontalTabStripVerticalOffset( 237 BrowserNonClientFrameView::TabStripInsets
238 bool restored) const { 238 AppNonClientFrameViewAura::GetTabStripInsets(bool restored) const {
239 return 0; 239 return TabStripInsets();
240 } 240 }
241 241
242 void AppNonClientFrameViewAura::UpdateThrobber(bool running) { 242 void AppNonClientFrameViewAura::UpdateThrobber(bool running) {
243 } 243 }
244 244
245 void AppNonClientFrameViewAura::OnMouseEntered( 245 void AppNonClientFrameViewAura::OnMouseEntered(
246 const views::MouseEvent& event) { 246 const views::MouseEvent& event) {
247 if (!control_view_) { 247 if (!control_view_) {
248 // This can only happen when the frame-view (|this|) is in the process of 248 // This can only happen when the frame-view (|this|) is in the process of
249 // destroying itself, but the control-widget has already closed, and some 249 // destroying itself, but the control-widget has already closed, and some
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 bool AppNonClientFrameViewAura::IsShowingControls() const { 324 bool AppNonClientFrameViewAura::IsShowingControls() const {
325 return control_widget_ && control_widget_->IsVisible(); 325 return control_widget_ && control_widget_->IsVisible();
326 } 326 }
327 327
328 void AppNonClientFrameViewAura::Restore() { 328 void AppNonClientFrameViewAura::Restore() {
329 if (control_widget_) 329 if (control_widget_)
330 control_widget_->Close(); 330 control_widget_->Close();
331 mouse_watcher_.Stop(); 331 mouse_watcher_.Stop();
332 frame()->Restore(); 332 frame()->Restore();
333 } 333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698