| OLD | NEW |
| 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/ui/tabs/pinned_tab_codec.h" | 5 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "chrome/browser/extensions/extension_tab_helper.h" | 8 #include "chrome/browser/extensions/extension_tab_helper.h" |
| 9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
| 10 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 10 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/common/extensions/extension.h" | 16 #include "chrome/common/extensions/extension.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "content/public/browser/navigation_entry.h" | 18 #include "content/public/browser/navigation_entry.h" |
| 19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 20 | 20 |
| 21 using content::NavigationEntry; | 21 using content::NavigationEntry; |
| 22 | 22 |
| 23 // Key used in dictionaries for the app id. | 23 // Key used in dictionaries for the app id. |
| 24 static const char kAppID[] = "app_id"; | 24 static const char kAppID[] = "app_id"; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 45 values->Append(value.release()); | 45 values->Append(value.release()); |
| 46 } | 46 } |
| 47 | 47 |
| 48 // Adds a DictionaryValue to |values| representing the pinned tab at the | 48 // Adds a DictionaryValue to |values| representing the pinned tab at the |
| 49 // specified index. | 49 // specified index. |
| 50 static void EncodePinnedTab(TabStripModel* model, | 50 static void EncodePinnedTab(TabStripModel* model, |
| 51 int index, | 51 int index, |
| 52 ListValue* values) { | 52 ListValue* values) { |
| 53 scoped_ptr<DictionaryValue> value(new DictionaryValue()); | 53 scoped_ptr<DictionaryValue> value(new DictionaryValue()); |
| 54 | 54 |
| 55 TabContentsWrapper* tab_contents = model->GetTabContentsAt(index); | 55 TabContents* tab_contents = model->GetTabContentsAt(index); |
| 56 if (model->IsAppTab(index)) { | 56 if (model->IsAppTab(index)) { |
| 57 const extensions::Extension* extension = | 57 const extensions::Extension* extension = |
| 58 tab_contents->extension_tab_helper()->extension_app(); | 58 tab_contents->extension_tab_helper()->extension_app(); |
| 59 DCHECK(extension); | 59 DCHECK(extension); |
| 60 value->SetString(kAppID, extension->id()); | 60 value->SetString(kAppID, extension->id()); |
| 61 // For apps we use the launch url. We do this for the following reason: | 61 // For apps we use the launch url. We do this for the following reason: |
| 62 // . the user is effectively restarting the app, so that returning them to | 62 // . the user is effectively restarting the app, so that returning them to |
| 63 // the app's launch page seems closest to what they expect. | 63 // the app's launch page seems closest to what they expect. |
| 64 value->SetString(kURL, extension->GetFullLaunchURL().spec()); | 64 value->SetString(kURL, extension->GetFullLaunchURL().spec()); |
| 65 values->Append(value.release()); | 65 values->Append(value.release()); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 for (size_t i = 0, max = tabs_list->GetSize(); i < max; ++i) { | 154 for (size_t i = 0, max = tabs_list->GetSize(); i < max; ++i) { |
| 155 base::DictionaryValue* tab_values = NULL; | 155 base::DictionaryValue* tab_values = NULL; |
| 156 if (tabs_list->GetDictionary(i, &tab_values)) { | 156 if (tabs_list->GetDictionary(i, &tab_values)) { |
| 157 StartupTab tab; | 157 StartupTab tab; |
| 158 if (DecodeTab(*tab_values, &tab)) | 158 if (DecodeTab(*tab_values, &tab)) |
| 159 results.push_back(tab); | 159 results.push_back(tab); |
| 160 } | 160 } |
| 161 } | 161 } |
| 162 return results; | 162 return results; |
| 163 } | 163 } |
| OLD | NEW |