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

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

Issue 2163953002: rebaseline huge-image-viewport-scale.html (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ignore_result() Created 4 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('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) 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/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 if (GetTextInputManager()) 484 if (GetTextInputManager())
485 GetTextInputManager()->AddObserver(this); 485 GetTextInputManager()->AddObserver(this);
486 486
487 bool overscroll_enabled = base::CommandLine::ForCurrentProcess()-> 487 bool overscroll_enabled = base::CommandLine::ForCurrentProcess()->
488 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0"; 488 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
489 SetOverscrollControllerEnabled(overscroll_enabled); 489 SetOverscrollControllerEnabled(overscroll_enabled);
490 490
491 selection_controller_client_.reset( 491 selection_controller_client_.reset(
492 new TouchSelectionControllerClientAura(this)); 492 new TouchSelectionControllerClientAura(this));
493 CreateSelectionController(); 493 CreateSelectionController();
494
495 RenderViewHost* rvh = RenderViewHost::From(host_);
496 if (rvh) {
497 // TODO(mostynb): actually use prefs. Landing this as a separate CL
498 // first to rebaseline some unreliable layout tests.
499 ignore_result(rvh->GetWebkitPreferences());
500 }
494 } 501 }
495 502
496 //////////////////////////////////////////////////////////////////////////////// 503 ////////////////////////////////////////////////////////////////////////////////
497 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: 504 // RenderWidgetHostViewAura, RenderWidgetHostView implementation:
498 505
499 bool RenderWidgetHostViewAura::OnMessageReceived( 506 bool RenderWidgetHostViewAura::OnMessageReceived(
500 const IPC::Message& message) { 507 const IPC::Message& message) {
501 bool handled = true; 508 bool handled = true;
502 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAura, message) 509 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAura, message)
503 IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrames, 510 IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrames,
(...skipping 2497 matching lines...) Expand 10 before | Expand all | Expand 10 after
3001 3008
3002 //////////////////////////////////////////////////////////////////////////////// 3009 ////////////////////////////////////////////////////////////////////////////////
3003 // RenderWidgetHostViewBase, public: 3010 // RenderWidgetHostViewBase, public:
3004 3011
3005 // static 3012 // static
3006 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 3013 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
3007 GetScreenInfoForWindow(results, NULL); 3014 GetScreenInfoForWindow(results, NULL);
3008 } 3015 }
3009 3016
3010 } // namespace content 3017 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698