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

Side by Side Diff: chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc

Issue 10917026: Switch Extensions::TabHelper to use WebContents, WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only 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 | 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/tabs/dragged_view_gtk.h" 5 #include "chrome/browser/ui/gtk/tabs/dragged_view_gtk.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 attached_tab_size_(TabRendererGtk::GetMinimumSelectedSize()), 64 attached_tab_size_(TabRendererGtk::GetMinimumSelectedSize()),
65 contents_size_(contents_size), 65 contents_size_(contents_size),
66 close_animation_(this) { 66 close_animation_(this) {
67 std::vector<WebContents*> data_sources(drag_data_->GetDraggedTabsContents()); 67 std::vector<WebContents*> data_sources(drag_data_->GetDraggedTabsContents());
68 for (size_t i = 0; i < data_sources.size(); i++) { 68 for (size_t i = 0; i < data_sources.size(); i++) {
69 renderers_.push_back(new TabRendererGtk(GtkThemeService::GetFrom( 69 renderers_.push_back(new TabRendererGtk(GtkThemeService::GetFrom(
70 Profile::FromBrowserContext(data_sources[i]->GetBrowserContext())))); 70 Profile::FromBrowserContext(data_sources[i]->GetBrowserContext()))));
71 } 71 }
72 72
73 for (size_t i = 0; i < drag_data_->size(); i++) { 73 for (size_t i = 0; i < drag_data_->size(); i++) {
74 TabContents* tab_contents = TabContents::FromWebContents( 74 WebContents* web_contents = drag_data_->get(i)->contents_->web_contents();
75 drag_data_->get(i)->contents_->web_contents());
76 renderers_[i]->UpdateData( 75 renderers_[i]->UpdateData(
77 drag_data_->get(i)->contents_->web_contents(), 76 web_contents,
78 tab_contents->extension_tab_helper()->is_app(), 77 extensions::TabHelper::FromWebContents(web_contents)->is_app(),
79 false); // loading_only 78 false); // loading_only
80 renderers_[i]->set_is_active( 79 renderers_[i]->set_is_active(
81 static_cast<int>(i) == drag_data_->source_tab_index()); 80 static_cast<int>(i) == drag_data_->source_tab_index());
82 } 81 }
83 82
84 container_ = gtk_window_new(GTK_WINDOW_POPUP); 83 container_ = gtk_window_new(GTK_WINDOW_POPUP);
85 SetContainerColorMap(); 84 SetContainerColorMap();
86 gtk_widget_set_app_paintable(container_, TRUE); 85 gtk_widget_set_app_paintable(container_, TRUE);
87 g_signal_connect(container_, "expose-event", G_CALLBACK(OnExposeThunk), this); 86 g_signal_connect(container_, "expose-event", G_CALLBACK(OnExposeThunk), this);
88 gtk_widget_add_events(container_, GDK_STRUCTURE_MASK); 87 gtk_widget_add_events(container_, GDK_STRUCTURE_MASK);
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 if (!attached_) { 465 if (!attached_) {
467 paint_at = widget_width / kScalingFactor - 466 paint_at = widget_width / kScalingFactor -
468 GetWidthInTabStripFromTo(0, index + 1); 467 GetWidthInTabStripFromTo(0, index + 1);
469 } 468 }
470 } 469 }
471 470
472 cairo_set_source_surface(cr, surface, paint_at, 0); 471 cairo_set_source_surface(cr, surface, paint_at, 0);
473 cairo_paint(cr); 472 cairo_paint(cr);
474 cairo_surface_destroy(surface); 473 cairo_surface_destroy(surface);
475 } 474 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698