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

Side by Side Diff: chrome/browser/ui/global_error/global_error.cc

Issue 2166853002: Reverse error and warning icons on app menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed warning icon and made all remaining browser_tools icons 1x (16x16) by default Created 4 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/global_error/global_error.h" 5 #include "chrome/browser/ui/global_error/global_error.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" 9 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
(...skipping 10 matching lines...) Expand all
21 21
22 GlobalError::GlobalError() {} 22 GlobalError::GlobalError() {}
23 23
24 GlobalError::~GlobalError() {} 24 GlobalError::~GlobalError() {}
25 25
26 GlobalError::Severity GlobalError::GetSeverity() { return SEVERITY_MEDIUM; } 26 GlobalError::Severity GlobalError::GetSeverity() { return SEVERITY_MEDIUM; }
27 27
28 gfx::Image GlobalError::MenuItemIcon() { 28 gfx::Image GlobalError::MenuItemIcon() {
29 #if defined(OS_MACOSX) || defined(OS_ANDROID) 29 #if defined(OS_MACOSX) || defined(OS_ANDROID)
30 return ResourceBundle::GetSharedInstance().GetNativeImageNamed( 30 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
31 IDR_INPUT_ALERT_MENU); 31 IDR_INPUT_ALERT_MENU);
Evan Stade 2016/07/21 17:28:43 might be worth pinging shrike to see if mac should
32 #else 32 #else
33 return gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 18, 33 return gfx::Image(gfx::CreateVectorIcon(
34 gfx::kGoogleYellow700)); 34 gfx::VectorIconId::BROWSER_TOOLS_ERROR, gfx::kGoogleYellow700));
35 #endif 35 #endif
36 } 36 }
37 37
38 // GlobalErrorWithStandardBubble --------------------------------------------- 38 // GlobalErrorWithStandardBubble ---------------------------------------------
39 39
40 GlobalErrorWithStandardBubble::GlobalErrorWithStandardBubble() 40 GlobalErrorWithStandardBubble::GlobalErrorWithStandardBubble()
41 : has_shown_bubble_view_(false), bubble_view_(NULL) {} 41 : has_shown_bubble_view_(false), bubble_view_(NULL) {}
42 42
43 GlobalErrorWithStandardBubble::~GlobalErrorWithStandardBubble() {} 43 GlobalErrorWithStandardBubble::~GlobalErrorWithStandardBubble() {}
44 44
(...skipping 30 matching lines...) Expand all
75 75
76 bool GlobalErrorWithStandardBubble::ShouldAddElevationIconToAcceptButton() { 76 bool GlobalErrorWithStandardBubble::ShouldAddElevationIconToAcceptButton() {
77 return false; 77 return false;
78 } 78 }
79 79
80 void GlobalErrorWithStandardBubble::BubbleViewDidClose(Browser* browser) { 80 void GlobalErrorWithStandardBubble::BubbleViewDidClose(Browser* browser) {
81 DCHECK(browser); 81 DCHECK(browser);
82 bubble_view_ = NULL; 82 bubble_view_ = NULL;
83 OnBubbleViewDidClose(browser); 83 OnBubbleViewDidClose(browser);
84 } 84 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm ('k') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698