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/sync/sync_error_notifier_ash.h" | 5 #include "chrome/browser/sync/sync_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 static const char kTestAccountId[] = "testuser@test.com"; | 41 static const char kTestAccountId[] = "testuser@test.com"; |
42 | 42 |
43 // Notification ID corresponding to kProfileSyncNotificationId + kTestAccountId. | 43 // Notification ID corresponding to kProfileSyncNotificationId + kTestAccountId. |
44 static const std::string kNotificationId = | 44 static const std::string kNotificationId = |
45 "chrome://settings/sync/testuser@test.com"; | 45 "chrome://settings/sync/testuser@test.com"; |
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 ~ScreenTypeDelegateDesktop() {} | 51 ~ScreenTypeDelegateDesktop() override {} |
52 virtual gfx::ScreenType GetScreenTypeForNativeView( | 52 gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override { |
53 gfx::NativeView view) override { | |
54 return chrome::IsNativeViewInAsh(view) ? | 53 return chrome::IsNativeViewInAsh(view) ? |
55 gfx::SCREEN_TYPE_ALTERNATE : | 54 gfx::SCREEN_TYPE_ALTERNATE : |
56 gfx::SCREEN_TYPE_NATIVE; | 55 gfx::SCREEN_TYPE_NATIVE; |
57 } | 56 } |
58 | 57 |
59 private: | 58 private: |
60 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop); | 59 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop); |
61 }; | 60 }; |
62 #endif | 61 #endif |
63 | 62 |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 SCOPED_TRACE("Not expecting notification since sync setup is incomplete"); | 231 SCOPED_TRACE("Not expecting notification since sync setup is incomplete"); |
233 VerifySyncErrorNotifierResult( | 232 VerifySyncErrorNotifierResult( |
234 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, | 233 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, |
235 false /* not signed in */, | 234 false /* not signed in */, |
236 false /* no error */); | 235 false /* no error */); |
237 } | 236 } |
238 } | 237 } |
239 | 238 |
240 } // namespace test | 239 } // namespace test |
241 } // namespace ash | 240 } // namespace ash |
OLD | NEW |