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

Side by Side Diff: chrome/browser/extensions/extension_error_ui_default.cc

Issue 15745022: Add custom icon support to GlobalError. Show extension icon in permissions increase bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no icon ok Created 7 years, 6 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) 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/extensions/extension_error_ui_default.h" 5 #include "chrome/browser/extensions/extension_error_ui_default.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
11 #include "chrome/browser/ui/chrome_pages.h" 11 #include "chrome/browser/ui/chrome_pages.h"
12 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" 12 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
13 #include "grit/theme_resources.h"
14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/image/image.h"
13 16
14 ExtensionErrorUIDefault::ExtensionErrorUIDefault( 17 ExtensionErrorUIDefault::ExtensionErrorUIDefault(
15 ExtensionService* extension_service) 18 ExtensionService* extension_service)
16 : ExtensionErrorUI(extension_service), 19 : ExtensionErrorUI(extension_service),
17 browser_(NULL), 20 browser_(NULL),
18 global_error_(new ExtensionGlobalError(this)) { 21 global_error_(new ExtensionGlobalError(this)) {
19 } 22 }
20 23
21 ExtensionErrorUIDefault::~ExtensionErrorUIDefault() { 24 ExtensionErrorUIDefault::~ExtensionErrorUIDefault() {
22 } 25 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 70
68 void ExtensionErrorUIDefault::ExtensionGlobalError::ExecuteMenuItem( 71 void ExtensionErrorUIDefault::ExtensionGlobalError::ExecuteMenuItem(
69 Browser* browser) { 72 Browser* browser) {
70 NOTREACHED(); 73 NOTREACHED();
71 } 74 }
72 75
73 bool ExtensionErrorUIDefault::ExtensionGlobalError::HasBubbleView() { 76 bool ExtensionErrorUIDefault::ExtensionGlobalError::HasBubbleView() {
74 return true; 77 return true;
75 } 78 }
76 79
80 gfx::Image ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewIcon() {
81 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
82 IDR_INPUT_ALERT);
83 }
84
77 string16 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewTitle() { 85 string16 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewTitle() {
78 return error_ui_->GetBubbleViewTitle(); 86 return error_ui_->GetBubbleViewTitle();
79 } 87 }
80 88
81 std::vector<string16> 89 std::vector<string16>
82 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewMessages() { 90 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewMessages() {
83 return error_ui_->GetBubbleViewMessages(); 91 return error_ui_->GetBubbleViewMessages();
84 } 92 }
85 93
86 string16 ExtensionErrorUIDefault::ExtensionGlobalError:: 94 string16 ExtensionErrorUIDefault::ExtensionGlobalError::
(...skipping 21 matching lines...) Expand all
108 void ExtensionErrorUIDefault::ExtensionGlobalError:: 116 void ExtensionErrorUIDefault::ExtensionGlobalError::
109 BubbleViewCancelButtonPressed(Browser* browser) { 117 BubbleViewCancelButtonPressed(Browser* browser) {
110 error_ui_->BubbleViewCancelButtonPressed(); 118 error_ui_->BubbleViewCancelButtonPressed();
111 } 119 }
112 120
113 // static 121 // static
114 ExtensionErrorUI* ExtensionErrorUI::Create( 122 ExtensionErrorUI* ExtensionErrorUI::Create(
115 ExtensionService* extension_service) { 123 ExtensionService* extension_service) {
116 return new ExtensionErrorUIDefault(extension_service); 124 return new ExtensionErrorUIDefault(extension_service);
117 } 125 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698