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

Unified Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Issue 8568039: Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/about_chrome_dialog.cc ('k') | chrome/browser/web_resource/gpu_blacklist_updater.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (revision 110237)
+++ chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (working copy)
@@ -59,11 +59,12 @@
// Width of the invisible gripper for resizing the toolbar.
const int kResizeGripperWidth = 4;
-const char kDragTarget[] = "application/x-chrome-browseraction";
+const char* kDragTarget = "application/x-chrome-browseraction";
GtkTargetEntry GetDragTargetEntry() {
+ static std::string drag_target_string(kDragTarget);
GtkTargetEntry drag_target;
- drag_target.target = const_cast<char*>(kDragTarget);
+ drag_target.target = const_cast<char*>(drag_target_string.c_str());
drag_target.flags = GTK_TARGET_SAME_APP;
drag_target.info = 0;
return drag_target;
« no previous file with comments | « chrome/browser/ui/gtk/about_chrome_dialog.cc ('k') | chrome/browser/web_resource/gpu_blacklist_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698