diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 15:22:20 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 15:22:20 +0000 |
| commit | 9bf14a24e1de759fddfbbee8050d65ef2d95ef18 (patch) | |
| tree | 24aa03d05b22be52366d8baf06dab96638ecf71b /chrome/browser/tabs | |
| parent | e685fc4178818c026f1498461edb3f2bfeff5722 (diff) | |
| download | chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.zip chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.tar.gz chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.tar.bz2 | |
Revert 42091 - Refactor apprelated manifest properties so that they don't
include the name 'app'. I think these will be useful for normal
extensions, too.
Also extract an ExtensionExtent class out of Extension. I think
this will be useful for passing by value to the IO thread.
Review URL: http://codereview.chromium.org/1025006
TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/1120005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/pinned_tab_codec.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tabs/pinned_tab_codec.cc b/chrome/browser/tabs/pinned_tab_codec.cc index df096fc..51b8fd2 100644 --- a/chrome/browser/tabs/pinned_tab_codec.cc +++ b/chrome/browser/tabs/pinned_tab_codec.cc @@ -50,7 +50,7 @@ static void EncodePinnedTab(TabStripModel* model, // . the user is effectively restarting the app, so that returning them to // the app's launch page seems closest to what they expect. // . we do the same when restoring a phantom tab. - value->SetString(kURL, extension->GetFullLaunchURL().spec()); + value->SetString(kURL, extension->app_launch_url().spec()); values->Append(value.release()); } else { NavigationEntry* entry = tab_contents->controller().GetActiveEntry(); diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index ac5881a2..4b67a43 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -1362,7 +1362,7 @@ TEST_F(TabStripModelTest, Apps) { FilePath path(FILE_PATH_LITERAL("/foo")); #endif Extension app_extension(path); - app_extension.launch_web_url_ = "http://www.google.com"; + app_extension.app_launch_url_ = GURL("http://www.google.com"); TabContents* contents1 = CreateTabContents(); contents1->SetAppExtension(&app_extension); TabContents* contents2 = CreateTabContents(); |