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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 2577023003: Removes WebContentsViewMus/RenderWidgetHostViewMus (Closed)
Patch Set: fix test Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index de94f2d1561a3ddca92f3c5cd0295e57e9a13ac1..a1d7c55af28f9d38d28fe3f127d28fce74443a9a 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -785,12 +785,13 @@ void WebContentsViewAura::CreateView(
// value is set shortly after this, so its safe to ignore.
DCHECK(aura::Env::GetInstanceDontCreate());
- window_.reset(new aura::Window(this));
+ window_ = base::MakeUnique<aura::Window>(this);
window_->set_owned_by_parent(false);
window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
+ window_->SetName("WebContentsViewAura");
window_->Init(ui::LAYER_NOT_DRAWN);
window_->AddObserver(this);
- aura::Window* root_window = context ? context->GetRootWindow() : NULL;
+ aura::Window* root_window = context ? context->GetRootWindow() : nullptr;
if (root_window) {
// There are places where there is no context currently because object
// hierarchies are built before they're attached to a Widget. (See
@@ -804,7 +805,6 @@ void WebContentsViewAura::CreateView(
root_window->GetBoundsInScreen());
}
window_->layer()->SetMasksToBounds(true);
- window_->SetName("WebContentsViewAura");
// WindowObserver is not interesting and is problematic for Browser Plugin
// guests.
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698