Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: chrome/browser/ui/views/browser_actions_container_browsertest.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "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/ui/views/browser_actions_container.h" 10 #include "chrome/browser/ui/views/browser_actions_container.h"
11 #include "chrome/common/extensions/extension_action.h" 11 #include "chrome/common/extensions/extension_action.h"
12 #include "chrome/common/extensions/extension_resource.h" 12 #include "chrome/common/extensions/extension_resource.h"
13 13
14 using extensions::Extension;
15
14 class BrowserActionsContainerTest : public ExtensionBrowserTest { 16 class BrowserActionsContainerTest : public ExtensionBrowserTest {
15 public: 17 public:
16 BrowserActionsContainerTest() { 18 BrowserActionsContainerTest() {
17 } 19 }
18 virtual ~BrowserActionsContainerTest() {} 20 virtual ~BrowserActionsContainerTest() {}
19 21
20 virtual void SetUpOnMainThread() OVERRIDE { 22 virtual void SetUpOnMainThread() OVERRIDE {
21 browser_actions_bar_.reset(new BrowserActionTestUtil(browser())); 23 browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
22 } 24 }
23 25
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 extension->GetResource(extension->browser_action()->default_icon_path()), 268 extension->GetResource(extension->browser_action()->default_icon_path()),
267 bitmap, 269 bitmap,
268 size); 270 size);
269 271
270 LOG(INFO) << "Disabling extension\n" << std::flush; 272 LOG(INFO) << "Disabling extension\n" << std::flush;
271 DisableExtension(extension->id()); 273 DisableExtension(extension->id());
272 LOG(INFO) << "Enabling extension\n" << std::flush; 274 LOG(INFO) << "Enabling extension\n" << std::flush;
273 EnableExtension(extension->id()); 275 EnableExtension(extension->id());
274 LOG(INFO) << "Test ending\n" << std::flush; 276 LOG(INFO) << "Test ending\n" << std::flush;
275 } 277 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698