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

Side by Side Diff: ash/test/ash_test_views_delegate.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « ash/test/ash_test_views_delegate.h ('k') | ash/test/child_modal_window.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/test/ash_test_views_delegate.h" 5 #include "ash/test/ash_test_views_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "content/public/test/web_contents_tester.h" 8 #include "content/public/test/web_contents_tester.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 AshTestViewsDelegate::AshTestViewsDelegate() { 13 AshTestViewsDelegate::AshTestViewsDelegate() {}
14 }
15 14
16 AshTestViewsDelegate::~AshTestViewsDelegate() { 15 AshTestViewsDelegate::~AshTestViewsDelegate() {}
17 }
18 16
19 content::WebContents* AshTestViewsDelegate::CreateWebContents( 17 content::WebContents* AshTestViewsDelegate::CreateWebContents(
20 content::BrowserContext* browser_context, 18 content::BrowserContext* browser_context,
21 content::SiteInstance* site_instance) { 19 content::SiteInstance* site_instance) {
22 return content::WebContentsTester::CreateTestWebContents(browser_context, 20 return content::WebContentsTester::CreateTestWebContents(browser_context,
23 site_instance); 21 site_instance);
24 } 22 }
25 23
26 void AshTestViewsDelegate::OnBeforeWidgetInit( 24 void AshTestViewsDelegate::OnBeforeWidgetInit(
27 views::Widget::InitParams* params, 25 views::Widget::InitParams* params,
28 views::internal::NativeWidgetDelegate* delegate) { 26 views::internal::NativeWidgetDelegate* delegate) {
29 TestViewsDelegate::OnBeforeWidgetInit(params, delegate); 27 TestViewsDelegate::OnBeforeWidgetInit(params, delegate);
30 28
31 if (!params->parent && !params->context && ash::Shell::HasInstance()) { 29 if (!params->parent && !params->context && ash::Shell::HasInstance()) {
32 // If the window has neither a parent nor a context add to the root. 30 // If the window has neither a parent nor a context add to the root.
33 params->parent = ash::Shell::GetInstance()->GetPrimaryRootWindow(); 31 params->parent = ash::Shell::GetInstance()->GetPrimaryRootWindow();
34 } 32 }
35 } 33 }
36 34
37 } // namespace test 35 } // namespace test
38 } // namespace ash 36 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_views_delegate.h ('k') | ash/test/child_modal_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698