| OLD | NEW |
| 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 30 matching lines...) Expand all Loading... |
| 41 // Notification ID corresponding to kProfileSigninNotificationId + | 41 // Notification ID corresponding to kProfileSigninNotificationId + |
| 42 // kTestAccountId. | 42 // kTestAccountId. |
| 43 static const std::string kNotificationId = | 43 static const std::string kNotificationId = |
| 44 "chrome://settings/signin/testuser@test.com"; | 44 "chrome://settings/signin/testuser@test.com"; |
| 45 } | 45 } |
| 46 | 46 |
| 47 #if defined(OS_WIN) | 47 #if defined(OS_WIN) |
| 48 class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate { | 48 class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate { |
| 49 public: | 49 public: |
| 50 ScreenTypeDelegateDesktop() {} | 50 ScreenTypeDelegateDesktop() {} |
| 51 virtual gfx::ScreenType GetScreenTypeForNativeView( | 51 gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override { |
| 52 gfx::NativeView view) override { | |
| 53 return chrome::IsNativeViewInAsh(view) ? | 52 return chrome::IsNativeViewInAsh(view) ? |
| 54 gfx::SCREEN_TYPE_ALTERNATE : | 53 gfx::SCREEN_TYPE_ALTERNATE : |
| 55 gfx::SCREEN_TYPE_NATIVE; | 54 gfx::SCREEN_TYPE_NATIVE; |
| 56 } | 55 } |
| 57 private: | 56 private: |
| 58 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop); | 57 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop); |
| 59 }; | 58 }; |
| 60 #endif | 59 #endif |
| 61 | 60 |
| 62 class SigninErrorNotifierTest : public AshTestBase { | 61 class SigninErrorNotifierTest : public AshTestBase { |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 EXPECT_FALSE(notification->title().empty()); | 251 EXPECT_FALSE(notification->title().empty()); |
| 253 EXPECT_FALSE(notification->message().empty()); | 252 EXPECT_FALSE(notification->message().empty()); |
| 254 EXPECT_EQ((size_t)1, notification->buttons().size()); | 253 EXPECT_EQ((size_t)1, notification->buttons().size()); |
| 255 } | 254 } |
| 256 } | 255 } |
| 257 } | 256 } |
| 258 #endif | 257 #endif |
| 259 | 258 |
| 260 } // namespace test | 259 } // namespace test |
| 261 } // namespace ash | 260 } // namespace ash |
| OLD | NEW |