| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" | 5 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/mac/scoped_nsobject.h" | 10 #include "base/mac/scoped_nsobject.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 class AppShimMenuControllerBrowserTest | 26 class AppShimMenuControllerBrowserTest |
| 27 : public extensions::PlatformAppBrowserTest { | 27 : public extensions::PlatformAppBrowserTest { |
| 28 protected: | 28 protected: |
| 29 AppShimMenuControllerBrowserTest() | 29 AppShimMenuControllerBrowserTest() |
| 30 : app_1_(NULL), | 30 : app_1_(NULL), |
| 31 app_2_(NULL), | 31 app_2_(NULL), |
| 32 initial_menu_item_count_(0) {} | 32 initial_menu_item_count_(0) {} |
| 33 | 33 |
| 34 virtual ~AppShimMenuControllerBrowserTest() {} | 34 virtual ~AppShimMenuControllerBrowserTest() {} |
| 35 | 35 |
| 36 void SetUpCommandLine(CommandLine* command_line) override { | 36 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 37 PlatformAppBrowserTest::SetUpCommandLine(command_line); | 37 PlatformAppBrowserTest::SetUpCommandLine(command_line); |
| 38 } | 38 } |
| 39 | 39 |
| 40 // Start two apps and wait for them to be launched. | 40 // Start two apps and wait for them to be launched. |
| 41 void SetUpApps() { | 41 void SetUpApps() { |
| 42 ExtensionTestMessageListener listener_1("Launched", false); | 42 ExtensionTestMessageListener listener_1("Launched", false); |
| 43 app_1_ = InstallAndLaunchPlatformApp("minimal_id"); | 43 app_1_ = InstallAndLaunchPlatformApp("minimal_id"); |
| 44 ASSERT_TRUE(listener_1.WaitUntilSatisfied()); | 44 ASSERT_TRUE(listener_1.WaitUntilSatisfied()); |
| 45 ExtensionTestMessageListener listener_2("Launched", false); | 45 ExtensionTestMessageListener listener_2("Launched", false); |
| 46 app_2_ = InstallAndLaunchPlatformApp("minimal"); | 46 app_2_ = InstallAndLaunchPlatformApp("minimal"); |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 | 149 |
| 150 CheckHasAppMenus(app_1_); | 150 CheckHasAppMenus(app_1_); |
| 151 ExtensionService::UninstallExtensionHelper( | 151 ExtensionService::UninstallExtensionHelper( |
| 152 extension_service(), | 152 extension_service(), |
| 153 app_1_->id(), | 153 app_1_->id(), |
| 154 extensions::UNINSTALL_REASON_FOR_TESTING); | 154 extensions::UNINSTALL_REASON_FOR_TESTING); |
| 155 CheckNoAppMenus(); | 155 CheckNoAppMenus(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace | 158 } // namespace |
| OLD | NEW |