OLD | NEW |
---|---|
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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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 | 494 |
495 RenderViewHost* rvh = RenderViewHost::From(host_); | 495 RenderViewHost* rvh = RenderViewHost::From(host_); |
496 if (rvh) { | 496 if (rvh) { |
497 // TODO(mostynb): actually use prefs. Landing this as a separate CL | 497 WebPreferences prefs = rvh->GetWebkitPreferences(); |
498 // first to rebaseline some unreliable layout tests. | 498 background_color_ = prefs.default_background_color; |
499 ignore_result(rvh->GetWebkitPreferences()); | 499 host_->SetBackgroundOpaque(GetBackgroundOpaque()); |
chrishtr
2016/07/29 18:15:41
Why do you also need to set whether it's opaque? I
| |
500 } | 500 } |
501 } | 501 } |
502 | 502 |
503 //////////////////////////////////////////////////////////////////////////////// | 503 //////////////////////////////////////////////////////////////////////////////// |
504 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: | 504 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: |
505 | 505 |
506 bool RenderWidgetHostViewAura::OnMessageReceived( | 506 bool RenderWidgetHostViewAura::OnMessageReceived( |
507 const IPC::Message& message) { | 507 const IPC::Message& message) { |
508 bool handled = true; | 508 bool handled = true; |
509 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAura, message) | 509 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAura, message) |
(...skipping 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3008 | 3008 |
3009 //////////////////////////////////////////////////////////////////////////////// | 3009 //////////////////////////////////////////////////////////////////////////////// |
3010 // RenderWidgetHostViewBase, public: | 3010 // RenderWidgetHostViewBase, public: |
3011 | 3011 |
3012 // static | 3012 // static |
3013 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3013 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
3014 GetScreenInfoForWindow(results, NULL); | 3014 GetScreenInfoForWindow(results, NULL); |
3015 } | 3015 } |
3016 | 3016 |
3017 } // namespace content | 3017 } // namespace content |
OLD | NEW |