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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

Issue 6539002: Begun the DCHECK() cleanup. Starting off with /src/chrome/a* and /src/chrome/... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/autocomplete/autocomplete_popup_view_gtk.h" 5 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 gdk_window_process_updates(window_->window, FALSE); 378 gdk_window_process_updates(window_->window, FALSE);
379 } 379 }
380 380
381 void AutocompletePopupViewGtk::OnDragCanceled() { 381 void AutocompletePopupViewGtk::OnDragCanceled() {
382 ignore_mouse_drag_ = true; 382 ignore_mouse_drag_ = true;
383 } 383 }
384 384
385 void AutocompletePopupViewGtk::Observe(NotificationType type, 385 void AutocompletePopupViewGtk::Observe(NotificationType type,
386 const NotificationSource& source, 386 const NotificationSource& source,
387 const NotificationDetails& details) { 387 const NotificationDetails& details) {
388 DCHECK(type == NotificationType::BROWSER_THEME_CHANGED); 388 DCHECK_EQ(type, NotificationType::BROWSER_THEME_CHANGED);
389 389
390 if (theme_provider_->UseGtkTheme()) { 390 if (theme_provider_->UseGtkTheme()) {
391 gtk_util::UndoForceFontSize(window_); 391 gtk_util::UndoForceFontSize(window_);
392 392
393 border_color_ = theme_provider_->GetBorderColor(); 393 border_color_ = theme_provider_->GetBorderColor();
394 394
395 gtk_util::GetTextColors( 395 gtk_util::GetTextColors(
396 &background_color_, &selected_background_color_, 396 &background_color_, &selected_background_color_,
397 &content_text_color_, &selected_content_text_color_); 397 &content_text_color_, &selected_content_text_color_);
398 398
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 (text_width - actual_content_width - 662 (text_width - actual_content_width -
663 (actual_description_width / PANGO_SCALE)), 663 (actual_description_width / PANGO_SCALE)),
664 content_y, layout_); 664 content_y, layout_);
665 } 665 }
666 } 666 }
667 667
668 g_object_unref(gc); 668 g_object_unref(gc);
669 669
670 return TRUE; 670 return TRUE;
671 } 671 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698