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

Side by Side Diff: chrome/browser/ui/gtk/collected_cookies_gtk.cc

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts Created 8 years, 5 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 | Annotate | Revision Log
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/gtk/collected_cookies_gtk.h" 5 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 #include "chrome/browser/browsing_data_appcache_helper.h" 8 #include "chrome/browser/browsing_data_appcache_helper.h"
9 #include "chrome/browser/browsing_data_cookie_helper.h" 9 #include "chrome/browser/browsing_data_cookie_helper.h"
10 #include "chrome/browser/browsing_data_database_helper.h" 10 #include "chrome/browser/browsing_data_database_helper.h"
11 #include "chrome/browser/browsing_data_file_system_helper.h" 11 #include "chrome/browser/browsing_data_file_system_helper.h"
12 #include "chrome/browser/browsing_data_indexed_db_helper.h" 12 #include "chrome/browser/browsing_data_indexed_db_helper.h"
13 #include "chrome/browser/browsing_data_local_storage_helper.h" 13 #include "chrome/browser/browsing_data_local_storage_helper.h"
14 #include "chrome/browser/browsing_data_server_bound_cert_helper.h" 14 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
15 #include "chrome/browser/content_settings/cookie_settings.h" 15 #include "chrome/browser/content_settings/cookie_settings.h"
16 #include "chrome/browser/content_settings/local_shared_objects_container.h" 16 #include "chrome/browser/content_settings/local_shared_objects_container.h"
17 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 17 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
18 #include "chrome/browser/cookies_tree_model.h" 18 #include "chrome/browser/cookies_tree_model.h"
19 #include "chrome/browser/infobars/infobar_tab_helper.h" 19 #include "chrome/browser/infobars/infobar_tab_helper.h"
20 #include "chrome/browser/local_data_container.h"
20 #include "chrome/browser/prefs/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/browser_dialogs.h" 23 #include "chrome/browser/ui/browser_dialogs.h"
23 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" 24 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
24 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" 25 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
25 #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h" 26 #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h"
26 #include "chrome/browser/ui/gtk/gtk_util.h" 27 #include "chrome/browser/ui/gtk/gtk_util.h"
27 #include "chrome/browser/ui/tab_contents/tab_contents.h" 28 #include "chrome/browser/ui/tab_contents/tab_contents.h"
28 #include "chrome/common/chrome_notification_types.h" 29 #include "chrome/common/chrome_notification_types.h"
29 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 GTK_POLICY_AUTOMATIC); 207 GTK_POLICY_AUTOMATIC);
207 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window), 208 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
208 GTK_SHADOW_ETCHED_IN); 209 GTK_SHADOW_ETCHED_IN);
209 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0); 210 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
210 211
211 TabSpecificContentSettings* content_settings = 212 TabSpecificContentSettings* content_settings =
212 tab_contents_->content_settings(); 213 tab_contents_->content_settings();
213 214
214 const LocalSharedObjectsContainer& allowed_lsos = 215 const LocalSharedObjectsContainer& allowed_lsos =
215 content_settings->allowed_local_shared_objects(); 216 content_settings->allowed_local_shared_objects();
216 allowed_cookies_tree_model_.reset( 217 ContainerMap apps_map;
217 new CookiesTreeModel(allowed_lsos.cookies()->Clone(), 218 apps_map[std::string()] = new LocalDataContainer(
218 allowed_lsos.databases()->Clone(), 219 std::string(), std::string(),
219 allowed_lsos.local_storages()->Clone(), 220 allowed_lsos.cookies()->Clone(),
220 allowed_lsos.session_storages()->Clone(), 221 allowed_lsos.databases()->Clone(),
221 allowed_lsos.appcaches()->Clone(), 222 allowed_lsos.local_storages()->Clone(),
222 allowed_lsos.indexed_dbs()->Clone(), 223 allowed_lsos.session_storages()->Clone(),
223 allowed_lsos.file_systems()->Clone(), 224 allowed_lsos.appcaches()->Clone(),
224 NULL, 225 allowed_lsos.indexed_dbs()->Clone(),
225 allowed_lsos.server_bound_certs()->Clone(), 226 allowed_lsos.file_systems()->Clone(),
226 true)); 227 NULL,
228 allowed_lsos.server_bound_certs()->Clone());
229 allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
227 allowed_cookies_tree_adapter_.reset( 230 allowed_cookies_tree_adapter_.reset(
228 new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get())); 231 new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
229 allowed_tree_ = gtk_tree_view_new_with_model( 232 allowed_tree_ = gtk_tree_view_new_with_model(
230 GTK_TREE_MODEL(allowed_cookies_tree_adapter_->tree_store())); 233 GTK_TREE_MODEL(allowed_cookies_tree_adapter_->tree_store()));
231 gtk_widget_set_size_request(allowed_tree_, kTreeViewWidth, kTreeViewHeight); 234 gtk_widget_set_size_request(allowed_tree_, kTreeViewWidth, kTreeViewHeight);
232 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(allowed_tree_), FALSE); 235 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(allowed_tree_), FALSE);
233 gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(allowed_tree_), TRUE); 236 gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(allowed_tree_), TRUE);
234 gtk_container_add(GTK_CONTAINER(scroll_window), allowed_tree_); 237 gtk_container_add(GTK_CONTAINER(scroll_window), allowed_tree_);
235 238
236 GtkTreeViewColumn* title_column = gtk_tree_view_column_new(); 239 GtkTreeViewColumn* title_column = gtk_tree_view_column_new();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 GTK_POLICY_AUTOMATIC); 298 GTK_POLICY_AUTOMATIC);
296 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window), 299 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
297 GTK_SHADOW_ETCHED_IN); 300 GTK_SHADOW_ETCHED_IN);
298 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0); 301 gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
299 302
300 TabSpecificContentSettings* content_settings = 303 TabSpecificContentSettings* content_settings =
301 tab_contents_->content_settings(); 304 tab_contents_->content_settings();
302 305
303 const LocalSharedObjectsContainer& blocked_lsos = 306 const LocalSharedObjectsContainer& blocked_lsos =
304 content_settings->blocked_local_shared_objects(); 307 content_settings->blocked_local_shared_objects();
305 blocked_cookies_tree_model_.reset( 308 ContainerMap apps_map;
306 new CookiesTreeModel(blocked_lsos.cookies()->Clone(), 309 apps_map[std::string()] = new LocalDataContainer(
307 blocked_lsos.databases()->Clone(), 310 std::string(), std::string(),
308 blocked_lsos.local_storages()->Clone(), 311 blocked_lsos.cookies()->Clone(),
309 blocked_lsos.session_storages()->Clone(), 312 blocked_lsos.databases()->Clone(),
310 blocked_lsos.appcaches()->Clone(), 313 blocked_lsos.local_storages()->Clone(),
311 blocked_lsos.indexed_dbs()->Clone(), 314 blocked_lsos.session_storages()->Clone(),
312 blocked_lsos.file_systems()->Clone(), 315 blocked_lsos.appcaches()->Clone(),
313 NULL, 316 blocked_lsos.indexed_dbs()->Clone(),
314 blocked_lsos.server_bound_certs()->Clone(), 317 blocked_lsos.file_systems()->Clone(),
315 true)); 318 NULL,
319 blocked_lsos.server_bound_certs()->Clone());
320 blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
316 blocked_cookies_tree_adapter_.reset( 321 blocked_cookies_tree_adapter_.reset(
317 new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get())); 322 new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
318 blocked_tree_ = gtk_tree_view_new_with_model( 323 blocked_tree_ = gtk_tree_view_new_with_model(
319 GTK_TREE_MODEL(blocked_cookies_tree_adapter_->tree_store())); 324 GTK_TREE_MODEL(blocked_cookies_tree_adapter_->tree_store()));
320 gtk_widget_set_size_request(blocked_tree_, kTreeViewWidth, kTreeViewHeight); 325 gtk_widget_set_size_request(blocked_tree_, kTreeViewWidth, kTreeViewHeight);
321 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(blocked_tree_), FALSE); 326 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(blocked_tree_), FALSE);
322 gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(blocked_tree_), TRUE); 327 gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(blocked_tree_), TRUE);
323 gtk_container_add(GTK_CONTAINER(scroll_window), blocked_tree_); 328 gtk_container_add(GTK_CONTAINER(scroll_window), blocked_tree_);
324 329
325 GtkTreeViewColumn* title_column = gtk_tree_view_column_new(); 330 GtkTreeViewColumn* title_column = gtk_tree_view_column_new();
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this); 558 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
554 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE); 559 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
555 g_signal_handlers_unblock_by_func( 560 g_signal_handlers_unblock_by_func(
556 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this); 561 tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
557 } 562 }
558 563
559 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) { 564 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
560 EnableControls(); 565 EnableControls();
561 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_))); 566 ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
562 } 567 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm ('k') | chrome/browser/ui/views/collected_cookies_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698