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

Side by Side Diff: chrome/browser/signin/signin_error_notifier_ash_unittest.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT 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 unified diff | Download patch
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 "chrome/browser/signin/signin_error_notifier_ash.h" 5 #include "chrome/browser/signin/signin_error_notifier_ash.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/notifications/notification.h" 10 #include "chrome/browser/notifications/notification.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 profile_->set_profile_name(kTestAccountId); 71 profile_->set_profile_name(kTestAccountId);
72 72
73 profile_manager_.reset( 73 profile_manager_.reset(
74 new TestingProfileManager(TestingBrowserProcess::GetGlobal())); 74 new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
75 ASSERT_TRUE(profile_manager_->SetUp()); 75 ASSERT_TRUE(profile_manager_->SetUp());
76 76
77 TestingBrowserProcess::GetGlobal(); 77 TestingBrowserProcess::GetGlobal();
78 AshTestBase::SetUp(); 78 AshTestBase::SetUp();
79 79
80 // Set up screen for Windows. 80 // Set up screen for Windows.
81 #if !defined(OS_CHROMEOS) 81 #if defined(OS_WIN)
82 aura::TestScreen* test_screen = aura::TestScreen::Create(); 82 aura::TestScreen* test_screen = aura::TestScreen::Create();
83 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen); 83 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen);
84 gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop); 84 gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop);
85 #endif 85 #endif
86 86
87 error_controller_ = 87 error_controller_ =
88 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())-> 88 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())->
89 signin_error_controller(); 89 signin_error_controller();
90 SigninErrorNotifierFactory::GetForProfile(profile_.get()); 90 SigninErrorNotifierFactory::GetForProfile(profile_.get());
91 notification_ui_manager_ = g_browser_process->notification_ui_manager(); 91 notification_ui_manager_ = g_browser_process->notification_ui_manager();
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 EXPECT_FALSE(notification->title().empty()); 231 EXPECT_FALSE(notification->title().empty());
232 EXPECT_FALSE(notification->message().empty()); 232 EXPECT_FALSE(notification->message().empty());
233 EXPECT_EQ((size_t)1, notification->buttons().size()); 233 EXPECT_EQ((size_t)1, notification->buttons().size());
234 } 234 }
235 } 235 }
236 } 236 }
237 #endif 237 #endif
238 238
239 } // namespace test 239 } // namespace test
240 } // namespace ash 240 } // namespace ash
OLDNEW
« no previous file with comments | « chrome/browser/notifications/message_center_notification_manager.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698