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

Side by Side Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 1262513002: Use vectorized icon for default extensions icons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove resource Created 5 years, 4 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/libgtk2ui/native_theme_gtk2.h" 5 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h" 9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
10 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" 10 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 return GetReadableColor(kNegativeTextColor, 405 return GetReadableColor(kNegativeTextColor,
406 GetEntryStyle()->base[GTK_STATE_SELECTED]); 406 GetEntryStyle()->base[GTK_STATE_SELECTED]);
407 } 407 }
408 408
409 // Throbber 409 // Throbber
410 case kColorId_ThrobberSpinningColor: 410 case kColorId_ThrobberSpinningColor:
411 case kColorId_ThrobberLightColor: { 411 case kColorId_ThrobberLightColor: {
412 return GetEntryStyle()->bg[GTK_STATE_SELECTED]; 412 return GetEntryStyle()->bg[GTK_STATE_SELECTED];
413 } 413 }
414 414
415 case kColorId_ChromeIconGrey:
415 case kColorId_ThrobberWaitingColor: 416 case kColorId_ThrobberWaitingColor:
416 case kColorId_NumColors: 417 case kColorId_NumColors:
417 NOTREACHED(); 418 NOTREACHED();
418 break; 419 break;
419 } 420 }
420 421
421 return SkColorToGdkColor(kInvalidColorIdColor); 422 return SkColorToGdkColor(kInvalidColorIdColor);
422 } 423 }
423 424
424 GtkWidget* NativeThemeGtk2::GetRealizedWindow() const { 425 GtkWidget* NativeThemeGtk2::GetRealizedWindow() const {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 0, 0, 527 0, 0,
527 rect.width(), rect.height()); 528 rect.width(), rect.height());
528 SkBitmap arrow = GdkPixbufToImageSkia(pb); 529 SkBitmap arrow = GdkPixbufToImageSkia(pb);
529 canvas->drawBitmap(arrow, rect.x(), rect.y()); 530 canvas->drawBitmap(arrow, rect.x(), rect.y());
530 531
531 g_object_unref(pb); 532 g_object_unref(pb);
532 g_object_unref(pm); 533 g_object_unref(pm);
533 } 534 }
534 535
535 } // namespace libgtk2ui 536 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698