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

Side by Side Diff: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

Issue 12212047: Linux/ChromeOS Chromium style checker cleanup, chrome/browser/extensions edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/browser_action_test_util.h" 6 #include "chrome/browser/extensions/browser_action_test_util.h"
7 #include "chrome/browser/extensions/extension_action.h" 7 #include "chrome/browser/extensions/extension_action.h"
8 #include "chrome/browser/extensions/extension_action_icon_factory.h" 8 #include "chrome/browser/extensions/extension_action_icon_factory.h"
9 #include "chrome/browser/extensions/extension_action_manager.h" 9 #include "chrome/browser/extensions/extension_action_manager.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 15 matching lines...) Expand all
26 // browser_actions_apitest.cc. 26 // browser_actions_apitest.cc.
27 27
28 namespace extensions { 28 namespace extensions {
29 namespace { 29 namespace {
30 30
31 class PageAsBrowserActionApiTest : public ExtensionApiTest { 31 class PageAsBrowserActionApiTest : public ExtensionApiTest {
32 public: 32 public:
33 PageAsBrowserActionApiTest() {} 33 PageAsBrowserActionApiTest() {}
34 virtual ~PageAsBrowserActionApiTest() {} 34 virtual ~PageAsBrowserActionApiTest() {}
35 35
36 void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 36 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
37 ExtensionApiTest::SetUpCommandLine(command_line); 37 ExtensionApiTest::SetUpCommandLine(command_line);
38 command_line->AppendSwitchASCII(switches::kScriptBadges, "1"); 38 command_line->AppendSwitchASCII(switches::kScriptBadges, "1");
39 } 39 }
40 40
41 protected: 41 protected:
42 BrowserActionTestUtil GetBrowserActionsBar() { 42 BrowserActionTestUtil GetBrowserActionsBar() {
43 return BrowserActionTestUtil(browser()); 43 return BrowserActionTestUtil(browser());
44 } 44 }
45 45
46 ExtensionActionManager* extension_action_manager() { 46 ExtensionActionManager* extension_action_manager() {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 ASSERT_TRUE(extension) << message_; 193 ASSERT_TRUE(extension) << message_;
194 194
195 ResultCatcher catcher; 195 ResultCatcher catcher;
196 ui_test_utils::NavigateToURL(browser(), 196 ui_test_utils::NavigateToURL(browser(),
197 GURL(extension->GetResourceURL("update.html"))); 197 GURL(extension->GetResourceURL("update.html")));
198 ASSERT_TRUE(catcher.GetNextResult()); 198 ASSERT_TRUE(catcher.GetNextResult());
199 } 199 }
200 200
201 } 201 }
202 } // namespace extensions 202 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698