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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 9 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/renderer_host/backing_store_skia.h" 8 #include "content/browser/renderer_host/backing_store_skia.h"
9 #include "content/browser/renderer_host/render_widget_host.h" 9 #include "content/browser/renderer_host/render_widget_host.h"
10 #include "content/browser/renderer_host/web_input_event_aura.h" 10 #include "content/browser/renderer_host/web_input_event_aura.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 void RenderWidgetHostViewAura::UnlockMouse() { 399 void RenderWidgetHostViewAura::UnlockMouse() {
400 // http://crbug.com/102563 400 // http://crbug.com/102563
401 NOTIMPLEMENTED(); 401 NOTIMPLEMENTED();
402 host_->LostMouseLock(); 402 host_->LostMouseLock();
403 } 403 }
404 404
405 //////////////////////////////////////////////////////////////////////////////// 405 ////////////////////////////////////////////////////////////////////////////////
406 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: 406 // RenderWidgetHostViewAura, aura::WindowDelegate implementation:
407 407
408 void RenderWidgetHostViewAura::OnBoundsChanging(gfx::Rect* new_bounds) {
409 }
410
408 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, 411 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
409 const gfx::Rect& new_bounds) { 412 const gfx::Rect& new_bounds) {
410 // We don't care about this one, we are always sized via SetSize() or 413 // We don't care about this one, we are always sized via SetSize() or
411 // SetBounds(). 414 // SetBounds().
412 } 415 }
413 416
414 void RenderWidgetHostViewAura::OnFocus() { 417 void RenderWidgetHostViewAura::OnFocus() {
415 host_->GotFocus(); 418 host_->GotFocus();
416 } 419 }
417 420
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 // static 544 // static
542 void RenderWidgetHostView::GetDefaultScreenInfo( 545 void RenderWidgetHostView::GetDefaultScreenInfo(
543 WebKit::WebScreenInfo* results) { 546 WebKit::WebScreenInfo* results) {
544 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize(); 547 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
545 results->rect = WebKit::WebRect(0, 0, size.width(), size.height()); 548 results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
546 results->availableRect = results->rect; 549 results->availableRect = results->rect;
547 // TODO(derat): Don't hardcode this? 550 // TODO(derat): Don't hardcode this?
548 results->depth = 24; 551 results->depth = 24;
549 results->depthPerComponent = 8; 552 results->depthPerComponent = 8;
550 } 553 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698