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

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

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof of concept Created 8 years, 3 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 "chrome/browser/extensions/browser_event_router.h" 5 #include "chrome/browser/extensions/browser_event_router.h"
6 #include "chrome/browser/extensions/extension_action.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_tab_util.h" 9 #include "chrome/browser/extensions/extension_tab_util.h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sessions/session_tab_helper.h" 11 #include "chrome/browser/sessions/session_tab_helper.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_tabstrip.h" 13 #include "chrome/browser/ui/browser_tabstrip.h"
13 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/omnibox/location_bar.h" 15 #include "chrome/browser/ui/omnibox/location_bar.h"
15 #include "chrome/browser/ui/tab_contents/tab_contents.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents.h"
16 #include "chrome/common/extensions/extension.h" 17 #include "chrome/common/extensions/extension.h"
17 #include "chrome/common/extensions/extension_action.h"
18 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "ui/gfx/image/image_skia.h" 20 #include "ui/gfx/image/image_skia.h"
21 21
22 using extensions::Extension; 22 using extensions::Extension;
23 23
24 namespace { 24 namespace {
25 25
26 gfx::Image CreateNonEmptyImage() { 26 gfx::Image CreateNonEmptyImage() {
27 SkBitmap bitmap; 27 SkBitmap bitmap;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Getters) { 241 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Getters) {
242 ASSERT_TRUE(RunExtensionTest("page_action/getters")) << message_; 242 ASSERT_TRUE(RunExtensionTest("page_action/getters")) << message_;
243 const Extension* extension = GetSingleLoadedExtension(); 243 const Extension* extension = GetSingleLoadedExtension();
244 ASSERT_TRUE(extension) << message_; 244 ASSERT_TRUE(extension) << message_;
245 245
246 ResultCatcher catcher; 246 ResultCatcher catcher;
247 ui_test_utils::NavigateToURL(browser(), 247 ui_test_utils::NavigateToURL(browser(),
248 GURL(extension->GetResourceURL("update.html"))); 248 GURL(extension->GetResourceURL("update.html")));
249 ASSERT_TRUE(catcher.GetNextResult()); 249 ASSERT_TRUE(catcher.GetNextResult());
250 } 250 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698