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

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

Issue 10827191: Convert extension action icons code to use ImageSkia instead of SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove includes we don't need anymore Created 8 years, 4 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_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_prefs.h" 8 #include "chrome/browser/extensions/extension_prefs.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_tab_util.h" 10 #include "chrome/browser/extensions/extension_tab_util.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/sessions/restore_tab_helper.h" 12 #include "chrome/browser/sessions/restore_tab_helper.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_tabstrip.h" 14 #include "chrome/browser/ui/browser_tabstrip.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/omnibox/location_bar.h" 16 #include "chrome/browser/ui/omnibox/location_bar.h"
17 #include "chrome/browser/ui/tab_contents/tab_contents.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/extensions/extension.h" 19 #include "chrome/common/extensions/extension.h"
20 #include "chrome/common/extensions/extension_action.h" 20 #include "chrome/common/extensions/extension_action.h"
21 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "ui/gfx/image/image_skia.h"
23 24
24 // These are a mash-up of the tests from from page_actions_apitest.cc and 25 // These are a mash-up of the tests from from page_actions_apitest.cc and
25 // browser_actions_apitest.cc. 26 // browser_actions_apitest.cc.
26 27
27 using extensions::Extension; 28 using extensions::Extension;
28 29
29 namespace { 30 namespace {
30 31
31 class PageAsBrowserActionApiTest : public ExtensionApiTest { 32 class PageAsBrowserActionApiTest : public ExtensionApiTest {
32 public: 33 public:
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 const Extension* extension = GetSingleLoadedExtension(); 180 const Extension* extension = GetSingleLoadedExtension();
180 ASSERT_TRUE(extension) << message_; 181 ASSERT_TRUE(extension) << message_;
181 182
182 ResultCatcher catcher; 183 ResultCatcher catcher;
183 ui_test_utils::NavigateToURL(browser(), 184 ui_test_utils::NavigateToURL(browser(),
184 GURL(extension->GetResourceURL("update.html"))); 185 GURL(extension->GetResourceURL("update.html")));
185 ASSERT_TRUE(catcher.GetNextResult()); 186 ASSERT_TRUE(catcher.GetNextResult());
186 } 187 }
187 188
188 } 189 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698