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

Unified Diff: trunk/src/ash/test/ash_test_views_delegate.cc

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
« no previous file with comments | « trunk/src/ash/test/ash_test_views_delegate.h ('k') | trunk/src/ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/test/ash_test_views_delegate.cc
===================================================================
--- trunk/src/ash/test/ash_test_views_delegate.cc (revision 270304)
+++ trunk/src/ash/test/ash_test_views_delegate.cc (working copy)
@@ -1,38 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/test/ash_test_views_delegate.h"
-
-#include "ash/shell.h"
-#include "content/public/test/web_contents_tester.h"
-
-namespace ash {
-namespace test {
-
-AshTestViewsDelegate::AshTestViewsDelegate() {
-}
-
-AshTestViewsDelegate::~AshTestViewsDelegate() {
-}
-
-content::WebContents* AshTestViewsDelegate::CreateWebContents(
- content::BrowserContext* browser_context,
- content::SiteInstance* site_instance) {
- return content::WebContentsTester::CreateTestWebContents(browser_context,
- site_instance);
-}
-
-void AshTestViewsDelegate::OnBeforeWidgetInit(
- views::Widget::InitParams* params,
- views::internal::NativeWidgetDelegate* delegate) {
- TestViewsDelegate::OnBeforeWidgetInit(params, delegate);
-
- if (!params->parent && !params->context && ash::Shell::HasInstance()) {
- // If the window has neither a parent nor a context add to the root.
- params->parent = ash::Shell::GetInstance()->GetPrimaryRootWindow();
- }
-}
-
-} // namespace test
-} // namespace ash
« no previous file with comments | « trunk/src/ash/test/ash_test_views_delegate.h ('k') | trunk/src/ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698