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

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

Issue 1289413003: Switch global error menu icon to vectorized MD asset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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) 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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_ThrobberWaitingColor: { 415 case kColorId_ThrobberWaitingColor: {
416 return GdkAlphaBlend(GetEntryStyle()->bg[GTK_STATE_SELECTED], 416 return GdkAlphaBlend(GetEntryStyle()->bg[GTK_STATE_SELECTED],
417 GetWindowStyle()->bg[GTK_STATE_NORMAL], 0xff / 2); 417 GetWindowStyle()->bg[GTK_STATE_NORMAL], 0xff / 2);
418 } 418 }
419 419
420 case kColorId_Amber:
420 case kColorId_ChromeIconGrey: 421 case kColorId_ChromeIconGrey:
421 case kColorId_GoogleBlue: 422 case kColorId_GoogleBlue:
422 case kColorId_NumColors: 423 case kColorId_NumColors:
423 NOTREACHED(); 424 NOTREACHED();
424 break; 425 break;
425 } 426 }
426 427
427 return SkColorToGdkColor(kInvalidColorIdColor); 428 return SkColorToGdkColor(kInvalidColorIdColor);
428 } 429 }
429 430
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 0, 0, 533 0, 0,
533 rect.width(), rect.height()); 534 rect.width(), rect.height());
534 SkBitmap arrow = GdkPixbufToImageSkia(pb); 535 SkBitmap arrow = GdkPixbufToImageSkia(pb);
535 canvas->drawBitmap(arrow, rect.x(), rect.y()); 536 canvas->drawBitmap(arrow, rect.x(), rect.y());
536 537
537 g_object_unref(pb); 538 g_object_unref(pb);
538 g_object_unref(pm); 539 g_object_unref(pm);
539 } 540 }
540 541
541 } // namespace libgtk2ui 542 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698