OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/run_loop.h" | 5 #include "base/run_loop.h" |
6 #include "base/strings/string_number_conversions.h" | 6 #include "base/strings/string_number_conversions.h" |
7 #include "chrome/browser/apps/app_browsertest_util.h" | 7 #include "chrome/browser/apps/app_browsertest_util.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/common/extensions/features/feature_channel.h" | 9 #include "chrome/common/extensions/features/feature_channel.h" |
10 #include "chrome/test/base/testing_profile.h" | 10 #include "chrome/test/base/testing_profile.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 public: | 27 public: |
28 explicit TestAppWindowRegistryObserver(Profile* profile) | 28 explicit TestAppWindowRegistryObserver(Profile* profile) |
29 : profile_(profile), icon_updates_(0) { | 29 : profile_(profile), icon_updates_(0) { |
30 AppWindowRegistry::Get(profile_)->AddObserver(this); | 30 AppWindowRegistry::Get(profile_)->AddObserver(this); |
31 } | 31 } |
32 virtual ~TestAppWindowRegistryObserver() { | 32 virtual ~TestAppWindowRegistryObserver() { |
33 AppWindowRegistry::Get(profile_)->RemoveObserver(this); | 33 AppWindowRegistry::Get(profile_)->RemoveObserver(this); |
34 } | 34 } |
35 | 35 |
36 // Overridden from AppWindowRegistry::Observer: | 36 // Overridden from AppWindowRegistry::Observer: |
37 virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE { | 37 virtual void OnAppWindowIconChanged(AppWindow* app_window) override { |
38 ++icon_updates_; | 38 ++icon_updates_; |
39 } | 39 } |
40 | 40 |
41 int icon_updates() { return icon_updates_; } | 41 int icon_updates() { return icon_updates_; } |
42 | 42 |
43 private: | 43 private: |
44 Profile* profile_; | 44 Profile* profile_; |
45 int icon_updates_; | 45 int icon_updates_; |
46 | 46 |
47 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver); | 47 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver); |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 "platform_apps/windows_api_ime/no_permissions_whitelisted")) | 187 "platform_apps/windows_api_ime/no_permissions_whitelisted")) |
188 << message_; | 188 << message_; |
189 | 189 |
190 EXPECT_TRUE(RunPlatformAppTest( | 190 EXPECT_TRUE(RunPlatformAppTest( |
191 "platform_apps/windows_api_ime/no_permissions_platform_app")) | 191 "platform_apps/windows_api_ime/no_permissions_platform_app")) |
192 << message_; | 192 << message_; |
193 } | 193 } |
194 #endif // OS_CHROMEOS | 194 #endif // OS_CHROMEOS |
195 | 195 |
196 } // namespace extensions | 196 } // namespace extensions |
OLD | NEW |