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

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

Issue 11588004: Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for CQ Created 7 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 GdkEventExpose* event) { 1542 GdkEventExpose* event) {
1543 gfx::CanvasSkiaPaint canvas(event, false); 1543 gfx::CanvasSkiaPaint canvas(event, false);
1544 GtkAllocation allocation; 1544 GtkAllocation allocation;
1545 gtk_widget_get_allocation(widget, &allocation); 1545 gtk_widget_get_allocation(widget, &allocation);
1546 badge_util::PaintBadge(&canvas, 1546 badge_util::PaintBadge(&canvas,
1547 gfx::Rect(allocation), 1547 gfx::Rect(allocation),
1548 base::UintToString(num_running_scripts_), 1548 base::UintToString(num_running_scripts_),
1549 SK_ColorWHITE, 1549 SK_ColorWHITE,
1550 SkColorSetRGB(0, 170, 0), 1550 SkColorSetRGB(0, 170, 0),
1551 allocation.width, 1551 allocation.width,
1552 Extension::ActionInfo::TYPE_PAGE); 1552 extensions::ActionInfo::TYPE_PAGE);
1553 return FALSE; 1553 return FALSE;
1554 } 1554 }
1555 1555
1556 void LocationBarViewGtk::OnStarButtonSizeAllocate(GtkWidget* sender, 1556 void LocationBarViewGtk::OnStarButtonSizeAllocate(GtkWidget* sender,
1557 GtkAllocation* allocation) { 1557 GtkAllocation* allocation) {
1558 if (!on_star_sized_.is_null()) { 1558 if (!on_star_sized_.is_null()) {
1559 on_star_sized_.Run(); 1559 on_star_sized_.Run();
1560 on_star_sized_.Reset(); 1560 on_star_sized_.Reset();
1561 } 1561 }
1562 star_sized_ = true; 1562 star_sized_ = true;
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 } 2184 }
2185 2185
2186 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 2186 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
2187 ExtensionAction* action) { 2187 ExtensionAction* action) {
2188 ExtensionPopupGtk::Show( 2188 ExtensionPopupGtk::Show(
2189 action->GetPopupUrl(current_tab_id_), 2189 action->GetPopupUrl(current_tab_id_),
2190 owner_->browser_, 2190 owner_->browser_,
2191 event_box_.get(), 2191 event_box_.get(),
2192 ExtensionPopupGtk::SHOW_AND_INSPECT); 2192 ExtensionPopupGtk::SHOW_AND_INSPECT);
2193 } 2193 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/views/location_bar/script_bubble_icon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698