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

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

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to master Created 6 years, 11 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 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 e4ef8c0f559455bbfdf3039cdfd5d6aae1122b9b..3d2a9773a61446f93503fbcc468558a6c4e05b88 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -965,7 +965,7 @@ void WebContentsViewAura::PrepareOverscrollWindow() {
overscroll_window_.reset(new aura::Window(overscroll_delegate));
overscroll_window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
overscroll_window_->SetTransparent(true);
- overscroll_window_->Init(ui::LAYER_TEXTURED);
+ overscroll_window_->Init(aura::WINDOW_LAYER_TEXTURED);
overscroll_window_->layer()->SetMasksToBounds(false);
overscroll_window_->SetName("OverscrollOverlay");
@@ -1218,7 +1218,7 @@ void WebContentsViewAura::CreateView(
window_->set_owned_by_parent(false);
window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
window_->SetTransparent(false);
- window_->Init(ui::LAYER_NOT_DRAWN);
+ window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
aura::Window* root_window = context ? context->GetRootWindow() : NULL;
if (root_window) {
// There are places where there is no context currently because object

Powered by Google App Engine
This is Rietveld 408576698