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

Side by Side Diff: chrome/browser/extensions/extension_tab_util.cc

Issue 10829186: Tabs API is usable without tabs permission. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 3 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/extensions/extension_tab_util.h" 5 #include "chrome/browser/extensions/extension_tab_util.h"
6 6
7 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 7 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
8 #include "chrome/browser/extensions/tab_helper.h" 8 #include "chrome/browser/extensions/tab_helper.h"
9 #include "chrome/browser/extensions/window_controller.h" 9 #include "chrome/browser/extensions/window_controller.h"
10 #include "chrome/browser/net/url_fixer_upper.h" 10 #include "chrome/browser/net/url_fixer_upper.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/sessions/session_id.h" 12 #include "chrome/browser/sessions/session_id.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_finder.h" 14 #include "chrome/browser/ui/browser_finder.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_tabstrip.h" 16 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/tab_contents/tab_contents.h" 18 #include "chrome/browser/ui/tab_contents/tab_contents.h"
19 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" 19 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
22 #include "chrome/common/extensions/extension_manifest_constants.h" 22 #include "chrome/common/extensions/extension_manifest_constants.h"
23 #include "chrome/common/extensions/permissions/api_permission.h"
23 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
24 #include "content/public/browser/favicon_status.h" 25 #include "content/public/browser/favicon_status.h"
25 #include "content/public/browser/navigation_entry.h" 26 #include "content/public/browser/navigation_entry.h"
26 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
27 #include "googleurl/src/gurl.h" 28 #include "googleurl/src/gurl.h"
28 29
29 namespace keys = extensions::tabs_constants; 30 namespace keys = extensions::tabs_constants;
30 31
31 using content::NavigationEntry; 32 using content::NavigationEntry;
32 using content::WebContents; 33 using content::WebContents;
(...skipping 18 matching lines...) Expand all
51 52
52 std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) { 53 std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
53 return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete; 54 return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete;
54 } 55 }
55 56
56 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) { 57 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
57 return SessionID::IdForWindowContainingTab( 58 return SessionID::IdForWindowContainingTab(
58 TabContents::FromWebContents(web_contents)); 59 TabContents::FromWebContents(web_contents));
59 } 60 }
60 61
61 DictionaryValue* ExtensionTabUtil::CreateTabValue(const WebContents* contents) { 62 DictionaryValue* ExtensionTabUtil::CreateTabValue(
63 const WebContents* contents,
64 const extensions::Extension* extension) {
62 // Find the tab strip and index of this guy. 65 // Find the tab strip and index of this guy.
63 TabStripModel* tab_strip = NULL; 66 TabStripModel* tab_strip = NULL;
64 int tab_index; 67 int tab_index;
65 if (ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index)) 68 if (ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index)) {
66 return ExtensionTabUtil::CreateTabValue(contents, tab_strip, tab_index); 69 return ExtensionTabUtil::CreateTabValue(contents,
70 tab_strip,
71 tab_index,
72 extension);
73 }
67 74
68 // Couldn't find it. This can happen if the tab is being dragged. 75 // Couldn't find it. This can happen if the tab is being dragged.
69 return ExtensionTabUtil::CreateTabValue(contents, NULL, -1); 76 return ExtensionTabUtil::CreateTabValue(contents, NULL, -1, extension);
70 } 77 }
71 78
72 ListValue* ExtensionTabUtil::CreateTabList(const Browser* browser) { 79 ListValue* ExtensionTabUtil::CreateTabList(
80 const Browser* browser,
81 const extensions::Extension* extension) {
73 ListValue* tab_list = new ListValue(); 82 ListValue* tab_list = new ListValue();
74 TabStripModel* tab_strip = browser->tab_strip_model(); 83 TabStripModel* tab_strip = browser->tab_strip_model();
75 for (int i = 0; i < tab_strip->count(); ++i) { 84 for (int i = 0; i < tab_strip->count(); ++i) {
76 tab_list->Append(ExtensionTabUtil::CreateTabValue( 85 tab_list->Append(CreateTabValue(
77 tab_strip->GetTabContentsAt(i)->web_contents(), tab_strip, i)); 86 tab_strip->GetTabContentsAt(i)->web_contents(),
87 tab_strip,
88 i,
89 extension));
78 } 90 }
79 91
80 return tab_list; 92 return tab_list;
81 } 93 }
82 94
83 DictionaryValue* ExtensionTabUtil::CreateTabValue(const WebContents* contents, 95 DictionaryValue* ExtensionTabUtil::CreateTabValue(
84 TabStripModel* tab_strip, 96 const WebContents* contents,
85 int tab_index) { 97 TabStripModel* tab_strip,
98 int tab_index,
99 const extensions::Extension* extension) {
100 CHECK(extension);
86 DictionaryValue* result = new DictionaryValue(); 101 DictionaryValue* result = new DictionaryValue();
87 bool is_loading = contents->IsLoading(); 102 bool is_loading = contents->IsLoading();
88 result->SetInteger(keys::kIdKey, ExtensionTabUtil::GetTabId(contents)); 103 result->SetInteger(keys::kIdKey, GetTabId(contents));
89 result->SetInteger(keys::kIndexKey, tab_index); 104 result->SetInteger(keys::kIndexKey, tab_index);
90 result->SetInteger(keys::kWindowIdKey, 105 result->SetInteger(keys::kWindowIdKey, GetWindowIdOfTab(contents));
91 ExtensionTabUtil::GetWindowIdOfTab(contents));
92 result->SetString(keys::kUrlKey, contents->GetURL().spec());
93 result->SetString(keys::kStatusKey, GetTabStatusText(is_loading)); 106 result->SetString(keys::kStatusKey, GetTabStatusText(is_loading));
94 result->SetBoolean(keys::kActiveKey, 107 result->SetBoolean(keys::kActiveKey,
95 tab_strip && tab_index == tab_strip->active_index()); 108 tab_strip && tab_index == tab_strip->active_index());
96 result->SetBoolean(keys::kSelectedKey, 109 result->SetBoolean(keys::kSelectedKey,
97 tab_strip && tab_index == tab_strip->active_index()); 110 tab_strip && tab_index == tab_strip->active_index());
98 result->SetBoolean(keys::kHighlightedKey, 111 result->SetBoolean(keys::kHighlightedKey,
99 tab_strip && tab_strip->IsTabSelected(tab_index)); 112 tab_strip && tab_strip->IsTabSelected(tab_index));
100 result->SetBoolean(keys::kPinnedKey, 113 result->SetBoolean(keys::kPinnedKey,
101 tab_strip && tab_strip->IsTabPinned(tab_index)); 114 tab_strip && tab_strip->IsTabPinned(tab_index));
102 result->SetString(keys::kTitleKey, contents->GetTitle());
103 result->SetBoolean(keys::kIncognitoKey, 115 result->SetBoolean(keys::kIncognitoKey,
104 contents->GetBrowserContext()->IsOffTheRecord()); 116 contents->GetBrowserContext()->IsOffTheRecord());
105 117
118 // If we have an extension without permissions, we don't add sensitive data.
119 if (extension->HasAPIPermissionForTab(tab_index,
chebert 2012/09/01 00:40:30 OK so problem with only setting the keys if they a
120 extensions::APIPermission::kTab)) {
121 result->SetString(keys::kUrlKey, contents->GetURL().spec());
122 result->SetString(keys::kTitleKey, contents->GetTitle());
123 if (!is_loading) {
124 NavigationEntry* entry = contents->GetController().GetActiveEntry();
125 if (entry && entry->GetFavicon().valid)
126 result->SetString(keys::kFaviconUrlKey, entry->GetFavicon().url.spec());
127 }
128 }
129
106 if (tab_strip) { 130 if (tab_strip) {
107 content::NavigationController* opener = 131 content::NavigationController* opener =
108 tab_strip->GetOpenerOfTabContentsAt(tab_index); 132 tab_strip->GetOpenerOfTabContentsAt(tab_index);
109 if (opener) { 133 if (opener) {
110 result->SetInteger(keys::kOpenerTabIdKey, 134 result->SetInteger(keys::kOpenerTabIdKey,
111 ExtensionTabUtil::GetTabId(opener->GetWebContents())); 135 GetTabId(opener->GetWebContents()));
112 } 136 }
113 } 137 }
114 138
115 if (!is_loading) {
116 NavigationEntry* entry = contents->GetController().GetActiveEntry();
117 if (entry) {
118 if (entry->GetFavicon().valid)
119 result->SetString(keys::kFaviconUrlKey, entry->GetFavicon().url.spec());
120 }
121 }
122
123 return result; 139 return result;
124 } 140 }
125 141
126 DictionaryValue* ExtensionTabUtil::CreateTabValueActive( 142 DictionaryValue* ExtensionTabUtil::CreateTabValueActive(
127 const WebContents* contents, 143 const WebContents* contents,
128 bool active) { 144 bool active,
129 DictionaryValue* result = ExtensionTabUtil::CreateTabValue(contents); 145 const extensions::Extension* extension) {
146 DictionaryValue* result = CreateTabValue(contents, extension);
130 result->SetBoolean(keys::kSelectedKey, active); 147 result->SetBoolean(keys::kSelectedKey, active);
131 return result; 148 return result;
132 } 149 }
133 150
134 bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents, 151 bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents,
135 TabStripModel** tab_strip_model, 152 TabStripModel** tab_strip_model,
136 int* tab_index) { 153 int* tab_index) {
137 DCHECK(web_contents); 154 DCHECK(web_contents);
138 DCHECK(tab_strip_model); 155 DCHECK(tab_strip_model);
139 DCHECK(tab_index); 156 DCHECK(tab_index);
(...skipping 14 matching lines...) Expand all
154 171
155 bool ExtensionTabUtil::GetDefaultTab(Browser* browser, 172 bool ExtensionTabUtil::GetDefaultTab(Browser* browser,
156 TabContents** contents, 173 TabContents** contents,
157 int* tab_id) { 174 int* tab_id) {
158 DCHECK(browser); 175 DCHECK(browser);
159 DCHECK(contents); 176 DCHECK(contents);
160 177
161 *contents = chrome::GetActiveTabContents(browser); 178 *contents = chrome::GetActiveTabContents(browser);
162 if (*contents) { 179 if (*contents) {
163 if (tab_id) 180 if (tab_id)
164 *tab_id = ExtensionTabUtil::GetTabId((*contents)->web_contents()); 181 *tab_id = GetTabId((*contents)->web_contents());
165 return true; 182 return true;
166 } 183 }
167 184
168 return false; 185 return false;
169 } 186 }
170 187
171 bool ExtensionTabUtil::GetTabById(int tab_id, 188 bool ExtensionTabUtil::GetTabById(int tab_id,
172 Profile* profile, 189 Profile* profile,
173 bool include_incognito, 190 bool include_incognito,
174 Browser** browser, 191 Browser** browser,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 281
265 // static 282 // static
266 extensions::WindowController* ExtensionTabUtil::GetWindowControllerOfTab( 283 extensions::WindowController* ExtensionTabUtil::GetWindowControllerOfTab(
267 const WebContents* web_contents) { 284 const WebContents* web_contents) {
268 Browser* browser = browser::FindBrowserWithWebContents(web_contents); 285 Browser* browser = browser::FindBrowserWithWebContents(web_contents);
269 if (browser != NULL) 286 if (browser != NULL)
270 return browser->extension_window_controller(); 287 return browser->extension_window_controller();
271 288
272 return NULL; 289 return NULL;
273 } 290 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698