summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 22:17:16 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 22:17:16 +0000
commit0c328d95376293dac03e78bbe6bac625b5e9fdbb (patch)
treef2bf52a1aebc3283ff3a4b354048ca3b5f6b1077
parent2bcccf4e51bfb7ea6ede5ba067051e89182ec167 (diff)
downloadchromium_src-0c328d95376293dac03e78bbe6bac625b5e9fdbb.zip
chromium_src-0c328d95376293dac03e78bbe6bac625b5e9fdbb.tar.gz
chromium_src-0c328d95376293dac03e78bbe6bac625b5e9fdbb.tar.bz2
Fix linux compile.
I guess the uninitialized error only comes up in Release builds, so trybots/local compile didn't catch it. BUG=none TEST=compile TBR=sadrul Review URL: http://codereview.chromium.org/3805002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62463 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/download_item_gtk.cc2
-rw-r--r--chrome/browser/gtk/tabs/tab_gtk.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 4f44eb1..5da78ca1 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -114,7 +114,7 @@ class DownloadShelfContextMenuGtk : public DownloadShelfContextMenu,
}
virtual GtkWidget* GetImageForCommandId(int command_id) const {
- const char* stock;
+ const char* stock = NULL;
switch (command_id) {
case SHOW_IN_FOLDER:
case OPEN_WHEN_COMPLETE:
diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc
index 04bc592..f07b723 100644
--- a/chrome/browser/gtk/tabs/tab_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_gtk.cc
@@ -101,7 +101,7 @@ class TabGtk::ContextMenuController : public menus::SimpleMenuModel::Delegate,
}
GtkWidget* GetImageForCommandId(int command_id) const {
- int browser_cmd_id;
+ int browser_cmd_id = 0;
switch (command_id) {
case TabStripModel::CommandNewTab:
browser_cmd_id = IDC_NEW_TAB;
@@ -366,7 +366,6 @@ void TabGtk::SetBounds(const gfx::Rect& bounds) {
void TabGtk::ShowContextMenu() {
menu_controller_.reset(new ContextMenuController(this));
-
menu_controller_->RunMenu();
}