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

Side by Side Diff: chrome/browser/ui/tabs/pinned_tab_codec.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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
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/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"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 TabContentsWrapper* tab_contents = model->GetTabContentsAt(index);
56 if (model->IsAppTab(index)) { 56 if (model->IsAppTab(index)) {
57 const 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());
66 } else { 66 } else {
67 NavigationEntry* entry = 67 NavigationEntry* entry =
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/ui/tabs/tab_strip_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698