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

Side by Side Diff: chrome/browser/gtk/bookmark_bar_gtk.cc

Issue 179028: Revert "Fix a ton of compiler warnings." (Closed)
Patch Set: Created 11 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/gtk/bookmark_bar_gtk.h" 5 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "app/gfx/text_elider.h" 9 #include "app/gfx/text_elider.h"
10 #include "app/gtk_dnd_util.h" 10 #include "app/gtk_dnd_util.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 } 392 }
393 393
394 bool BookmarkBarGtk::IsAlwaysShown() { 394 bool BookmarkBarGtk::IsAlwaysShown() {
395 return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar); 395 return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
396 } 396 }
397 397
398 void BookmarkBarGtk::AnimationProgressed(const Animation* animation) { 398 void BookmarkBarGtk::AnimationProgressed(const Animation* animation) {
399 DCHECK_EQ(animation, slide_animation_.get()); 399 DCHECK_EQ(animation, slide_animation_.get());
400 400
401 gtk_widget_set_size_request(event_box_.get(), -1, 401 gtk_widget_set_size_request(event_box_.get(), -1,
402 static_cast<gint>(animation->GetCurrentValue() * 402 animation->GetCurrentValue() *
403 kBookmarkBarHeight)); 403 kBookmarkBarHeight);
404 } 404 }
405 405
406 void BookmarkBarGtk::AnimationEnded(const Animation* animation) { 406 void BookmarkBarGtk::AnimationEnded(const Animation* animation) {
407 DCHECK_EQ(animation, slide_animation_.get()); 407 DCHECK_EQ(animation, slide_animation_.get());
408 408
409 if (!slide_animation_->IsShowing()) 409 if (!slide_animation_->IsShowing())
410 gtk_widget_hide(widget()); 410 gtk_widget_hide(widget());
411 } 411 }
412 412
413 void BookmarkBarGtk::Observe(NotificationType type, 413 void BookmarkBarGtk::Observe(NotificationType type,
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 cairo_set_line_width(cr, 1.0); 879 cairo_set_line_width(cr, 1.0);
880 cairo_move_to(cr, start_x, widget->allocation.y); 880 cairo_move_to(cr, start_x, widget->allocation.y);
881 cairo_line_to(cr, start_x, 881 cairo_line_to(cr, start_x,
882 widget->allocation.y + widget->allocation.height); 882 widget->allocation.y + widget->allocation.height);
883 cairo_stroke(cr); 883 cairo_stroke(cr);
884 cairo_destroy(cr); 884 cairo_destroy(cr);
885 cairo_pattern_destroy(pattern); 885 cairo_pattern_destroy(pattern);
886 886
887 return TRUE; 887 return TRUE;
888 } 888 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/back_forward_button_gtk.cc ('k') | chrome/browser/gtk/bookmark_manager_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698