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

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

Issue 10912156: Move SessionID, CaptureVisibleTabFunction to WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase atop the extension tab helper change 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/location_bar_view_gtk.h" 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1769 matching lines...) Expand 10 before | Expand all | Expand 10 after
1780 ExtensionAction* page_action) 1780 ExtensionAction* page_action)
1781 : owner_(NULL), 1781 : owner_(NULL),
1782 page_action_(page_action), 1782 page_action_(page_action),
1783 tracker_(this), 1783 tracker_(this),
1784 current_tab_id_(-1), 1784 current_tab_id_(-1),
1785 window_(NULL), 1785 window_(NULL),
1786 accel_group_(NULL), 1786 accel_group_(NULL),
1787 preview_enabled_(false), 1787 preview_enabled_(false),
1788 ALLOW_THIS_IN_INITIALIZER_LIST(scoped_icon_animation_observer_( 1788 ALLOW_THIS_IN_INITIALIZER_LIST(scoped_icon_animation_observer_(
1789 page_action->GetIconAnimation( 1789 page_action->GetIconAnimation(
1790 SessionID::IdForTab(owner->GetTabContents())), 1790 SessionID::IdForTab(owner->GetTabContents()->web_contents())),
1791 this)) { 1791 this)) {
1792 event_box_.Own(gtk_event_box_new()); 1792 event_box_.Own(gtk_event_box_new());
1793 gtk_widget_set_size_request(event_box_.get(), 1793 gtk_widget_set_size_request(event_box_.get(),
1794 Extension::kPageActionIconMaxSize, 1794 Extension::kPageActionIconMaxSize,
1795 Extension::kPageActionIconMaxSize); 1795 Extension::kPageActionIconMaxSize);
1796 1796
1797 // Make the event box not visible so it does not paint a background. 1797 // Make the event box not visible so it does not paint a background.
1798 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE); 1798 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
1799 g_signal_connect(event_box_.get(), "button-press-event", 1799 g_signal_connect(event_box_.get(), "button-press-event",
1800 G_CALLBACK(&OnButtonPressedThunk), this); 1800 G_CALLBACK(&OnButtonPressedThunk), this);
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 } 2110 }
2111 2111
2112 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 2112 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
2113 ExtensionAction* action) { 2113 ExtensionAction* action) {
2114 ExtensionPopupGtk::Show( 2114 ExtensionPopupGtk::Show(
2115 action->GetPopupUrl(current_tab_id_), 2115 action->GetPopupUrl(current_tab_id_),
2116 owner_->browser_, 2116 owner_->browser_,
2117 event_box_.get(), 2117 event_box_.get(),
2118 ExtensionPopupGtk::SHOW_AND_INSPECT); 2118 ExtensionPopupGtk::SHOW_AND_INSPECT);
2119 } 2119 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698