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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 11366215: Prevents windows in chromeos from resizing bigger than their maximum size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments Created 8 years, 1 month 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 "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/renderer_host/dip_util.h" 8 #include "content/browser/renderer_host/dip_util.h"
9 #include "content/browser/renderer_host/render_view_host_factory.h" 9 #include "content/browser/renderer_host/render_view_host_factory.h"
10 #include "content/browser/web_contents/interstitial_page_impl.h" 10 #include "content/browser/web_contents/interstitial_page_impl.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 } 495 }
496 } 496 }
497 497
498 //////////////////////////////////////////////////////////////////////////////// 498 ////////////////////////////////////////////////////////////////////////////////
499 // WebContentsViewAura, aura::WindowDelegate implementation: 499 // WebContentsViewAura, aura::WindowDelegate implementation:
500 500
501 gfx::Size WebContentsViewAura::GetMinimumSize() const { 501 gfx::Size WebContentsViewAura::GetMinimumSize() const {
502 return gfx::Size(); 502 return gfx::Size();
503 } 503 }
504 504
505 gfx::Size WebContentsViewAura::GetMaximumSize() const {
506 return gfx::Size();
507 }
508
505 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, 509 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
506 const gfx::Rect& new_bounds) { 510 const gfx::Rect& new_bounds) {
507 SizeChangedCommon(new_bounds.size()); 511 SizeChangedCommon(new_bounds.size());
508 if (delegate_.get()) 512 if (delegate_.get())
509 delegate_->SizeChanged(new_bounds.size()); 513 delegate_->SizeChanged(new_bounds.size());
510 514
511 // Constrained web dialogs, need to be kept centered over our content area. 515 // Constrained web dialogs, need to be kept centered over our content area.
512 for (size_t i = 0; i < window_->children().size(); i++) { 516 for (size_t i = 0; i < window_->children().size(); i++) {
513 if (window_->children()[i]->GetProperty( 517 if (window_->children()[i]->GetProperty(
514 aura::client::kConstrainedWindowKey)) { 518 aura::client::kConstrainedWindowKey)) {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 event.location(), 688 event.location(),
685 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 689 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
686 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 690 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
687 if (drag_dest_delegate_) 691 if (drag_dest_delegate_)
688 drag_dest_delegate_->OnDrop(); 692 drag_dest_delegate_->OnDrop();
689 current_drop_data_.reset(); 693 current_drop_data_.reset();
690 return current_drag_op_; 694 return current_drag_op_;
691 } 695 }
692 696
693 } // namespace content 697 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698