OLD | NEW |
1 // Copyright (c) 2011 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/ui/panels/base_panel_browser_test.h" | 5 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
6 | 6 |
7 #include "chrome/browser/ui/browser_list.h" | 7 #include "chrome/browser/ui/browser_list.h" |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/panels/native_panel.h" | 16 #include "chrome/browser/ui/panels/native_panel.h" |
17 #include "chrome/browser/ui/panels/panel_manager.h" | 17 #include "chrome/browser/ui/panels/panel_manager.h" |
18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/string_ordinal.h" |
20 #include "chrome/test/base/ui_test_utils.h" | 21 #include "chrome/test/base/ui_test_utils.h" |
21 #include "content/browser/tab_contents/test_tab_contents.h" | 22 #include "content/browser/tab_contents/test_tab_contents.h" |
22 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
23 #include "content/public/common/url_constants.h" | 24 #include "content/public/common/url_constants.h" |
24 | 25 |
25 #if defined(OS_MACOSX) | 26 #if defined(OS_MACOSX) |
26 #include "base/mac/scoped_nsautorelease_pool.h" | 27 #include "base/mac/scoped_nsautorelease_pool.h" |
27 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
28 #endif | 29 #endif |
29 | 30 |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0"); | 349 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0"); |
349 input_value->SetString(extension_manifest_keys::kName, "Sample Extension"); | 350 input_value->SetString(extension_manifest_keys::kName, "Sample Extension"); |
350 | 351 |
351 std::string error; | 352 std::string error; |
352 scoped_refptr<Extension> extension = Extension::Create( | 353 scoped_refptr<Extension> extension = Extension::Create( |
353 full_path, location, *input_value, | 354 full_path, location, *input_value, |
354 Extension::STRICT_ERROR_CHECKS, &error); | 355 Extension::STRICT_ERROR_CHECKS, &error); |
355 EXPECT_TRUE(extension.get()); | 356 EXPECT_TRUE(extension.get()); |
356 EXPECT_STREQ("", error.c_str()); | 357 EXPECT_STREQ("", error.c_str()); |
357 browser()->GetProfile()->GetExtensionService()-> | 358 browser()->GetProfile()->GetExtensionService()-> |
358 OnExtensionInstalled(extension.get(), false, -1); | 359 OnExtensionInstalled(extension.get(), false, StringOrdinal()); |
359 return extension; | 360 return extension; |
360 } | 361 } |
OLD | NEW |