| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/browser_action_test_util.h" | 5 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 6 #include "chrome/browser/extensions/extension_browsertest.h" | 6 #include "chrome/browser/extensions/extension_browsertest.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/views/browser_actions_container.h" | 10 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/extensions/extension_action.h" | 12 #include "chrome/common/extensions/extension_action.h" |
| 13 #include "chrome/common/extensions/extension_resource.h" | 13 #include "chrome/common/extensions/extension_resource.h" |
| 14 | 14 |
| 15 class BrowserActionsContainerTest : public ExtensionBrowserTest { | 15 class BrowserActionsContainerTest : public ExtensionBrowserTest { |
| 16 public: | 16 public: |
| 17 BrowserActionsContainerTest() : browser_(NULL) { | 17 BrowserActionsContainerTest() : browser_(NULL) { |
| 18 } | 18 } |
| 19 virtual ~BrowserActionsContainerTest() {} | 19 virtual ~BrowserActionsContainerTest() {} |
| 20 | 20 |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 extension->GetResource(extension->browser_action()->default_icon_path()), | 272 extension->GetResource(extension->browser_action()->default_icon_path()), |
| 273 bitmap, | 273 bitmap, |
| 274 size); | 274 size); |
| 275 | 275 |
| 276 LOG(INFO) << "Disabling extension\n" << std::flush; | 276 LOG(INFO) << "Disabling extension\n" << std::flush; |
| 277 DisableExtension(extension->id()); | 277 DisableExtension(extension->id()); |
| 278 LOG(INFO) << "Enabling extension\n" << std::flush; | 278 LOG(INFO) << "Enabling extension\n" << std::flush; |
| 279 EnableExtension(extension->id()); | 279 EnableExtension(extension->id()); |
| 280 LOG(INFO) << "Test ending\n" << std::flush; | 280 LOG(INFO) << "Test ending\n" << std::flush; |
| 281 } | 281 } |
| OLD | NEW |