diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 16:01:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 16:01:49 +0000 |
| commit | 3b35564a393a641b95f4fd307d5b1b126b498e5a (patch) | |
| tree | df57140fbf8f5dd425f35bbd65a61795f3e0e084 /chrome/browser/tabs/tab_strip_model_unittest.cc | |
| parent | 210e33bb96f415629c4404b8b72199de80f3a33b (diff) | |
| download | chromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.zip chromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.tar.gz chromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.tar.bz2 | |
Wires TabContents to app extensions.
BUG=32845
TEST=none
Review URL: http://codereview.chromium.org/566032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model_unittest.cc')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 7330a41..f577bc6 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "app/system_monitor.h" +#include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -16,6 +17,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/property_bag.h" #include "chrome/common/url_constants.h" @@ -1347,10 +1349,17 @@ TEST_F(TabStripModelTest, Apps) { typedef MockTabStripModelObserver::State State; +#if defined(OS_WIN) + FilePath path(FILE_PATH_LITERAL("c:\\foo")); +#elif defined(OS_POSIX) + FilePath path(FILE_PATH_LITERAL("/foo")); +#endif + Extension app_extension(path); + app_extension.app_launch_url_ = GURL("http://www.google.com"); TabContents* contents1 = CreateTabContents(); - contents1->set_app(true); + contents1->SetAppExtension(&app_extension); TabContents* contents2 = CreateTabContents(); - contents2->set_app(true); + contents2->SetAppExtension(&app_extension); TabContents* contents3 = CreateTabContents(); SetID(contents1, 1); |