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

Unified Diff: chrome/browser/tab_contents/tab_contents_ssl_helper.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/tab_contents_ssl_helper.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents_ssl_helper.cc (revision 91968)
+++ chrome/browser/tab_contents/tab_contents_ssl_helper.cc (working copy)
@@ -14,6 +14,7 @@
#include "chrome/browser/tab_contents/infobar.h"
#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/browser/ssl/ssl_client_auth_handler.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
@@ -114,7 +115,7 @@
private:
// NotificationObserver:
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details);
@@ -130,8 +131,10 @@
: tab_contents_(tab_contents),
infobar_delegate_(NULL) {
Source<TabContentsWrapper> source(tab_contents_);
- registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, source);
- registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REPLACED, source);
+ registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
+ source);
+ registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED,
+ source);
}
TabContentsSSLHelper::SSLAddCertData::~SSLAddCertData() {
@@ -153,13 +156,13 @@
}
void TabContentsSSLHelper::SSLAddCertData::Observe(
- NotificationType type,
+ int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED ||
- type.value == NotificationType::TAB_CONTENTS_INFOBAR_REPLACED);
+ DCHECK(type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED ||
+ type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED);
if (infobar_delegate_ ==
- ((type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) ?
+ ((type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED) ?
Details<InfoBarRemovedDetails>(details)->first :
Details<InfoBarReplacedDetails>(details)->first))
infobar_delegate_ = NULL;
« no previous file with comments | « chrome/browser/tab_contents/popup_menu_helper_mac.mm ('k') | chrome/browser/tab_contents/tab_contents_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698