From 7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df Mon Sep 17 00:00:00 2001 From: "craig.schlenter@chromium.org" Date: Mon, 7 Sep 2009 19:01:41 +0000 Subject: Fix some gcc 4.4 issues when compiling with toolkit_views. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of these squash harmless compiler warnings but the custom_button.cc change fixes a real problem with the accelerator key bitmask calculation (+ preceeds << in terms of operator precedence) The change to tab_strip.cc is ugly but it fixes the following error: chrome/browser/views/tabs/tab_strip.cc: In member function ‘void TabStrip::StartRemoveTabAnimation(int, TabContents*)’: chrome/browser/views/tabs/tab_strip.cc:201: error: assuming signed overflow does not occur when assuming that (X - c) > X is always false As an added bonus, this makes the Linux shared build of toolkit_views work too. Review URL: http://codereview.chromium.org/199025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25602 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/dialog_stubs_gtk.cc | 5 ----- chrome/browser/views/tabs/tab_strip.cc | 6 ++++++ chrome/chrome.gyp | 7 +++++-- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc index 0fe25e5..8df1833 100644 --- a/chrome/browser/views/dialog_stubs_gtk.cc +++ b/chrome/browser/views/dialog_stubs_gtk.cc @@ -46,11 +46,6 @@ void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser, NOTIMPLEMENTED(); } -FindBar* CreateFindBar(BrowserView* browser_view) { - NOTIMPLEMENTED(); - return NULL; -} - void ShowPasswordsExceptionsWindowView(Profile* profile) { NOTIMPLEMENTED(); } diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 3ff6d45..d615e7a 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -36,6 +36,12 @@ #undef min #undef max +#if defined(COMPILER_GCC) +// Squash false positive signed overflow warning in GenerateStartAndEndWidths +// when doing 'start_tab_count < end_tab_count'. +#pragma GCC diagnostic ignored "-Wstrict-overflow" +#endif + using views::DropTargetEvent; static const int kDefaultAnimationDurationMs = 100; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5aa5234..629321c 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2532,8 +2532,6 @@ ['include', '^browser/gtk/import_lock_dialog_gtk.h'], ['include', '^browser/gtk/keyword_editor_view.cc'], ['include', '^browser/gtk/keyword_editor_view.h'], - ['include', '^browser/gtk/list_store_favicon_loader.cc'], - ['include', '^browser/gtk/list_store_favicon_loader.h'], ['include', '^browser/gtk/menu_gtk.cc'], ['include', '^browser/gtk/menu_gtk.h'], ['include', '^browser/gtk/tab_contents_drag_source.cc'], @@ -2550,6 +2548,11 @@ ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'], ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'], + # This compiles but has Linux shared build linking issues due to + # missing rsa_private_key functions. + ['exclude', '^browser/extensions/extension_creator.cc'], + # This compiles but it needs extension_creator. + ['exclude', '^browser/extensions/pack_extension_job.cc'], ], }], ['chromeos==1',{ -- cgit v1.1