--- a/usbuis/usbuinotif/inc/usbuinotifotgwarning.h	Tue Aug 31 16:13:57 2010 +0300
+++ b/usbuis/usbuinotif/inc/usbuinotifotgwarning.h	Wed Sep 01 12:20:49 2010 +0100
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:  Declares USB OTG Warning notifier.
+* Description:  Declares USB UI connection notifier.
  *
 */
 
@@ -20,11 +20,11 @@
 #define USBUINOTIFOTGWARNING_H
 
 // INCLUDES
-
+#include <aknnotewrappers.h>
 #include <usbuinotif.h>
-#include <hb/hbwidgets/hbdevicemessageboxsymbian.h>
 
 #include "usbnotifier.h"   // Base class
+#define KUsbUiNotifOtgGeneralNoteGranularity 1
 // CLASS DECLARATION
 
 /**
@@ -32,8 +32,7 @@
  *  Synchronous call is enouph.
  * 
  */
-NONSHARABLE_CLASS(CUsbUiNotifOtgWarning) : public CUSBUINotifierBase,
-                                           public MHbDeviceMessageBoxObserver
+NONSHARABLE_CLASS(CUsbUiNotifOtgWarning) : public CUSBUINotifierBase
     {
 public:
     // Constructors and destructor
@@ -47,13 +46,6 @@
      * Destructor.
      */
     virtual ~CUsbUiNotifOtgWarning();
-    /**
-       * Call back function to observe device message box closing.
-       * @param aMessageBox Pointer to the closing message box instance.
-       * @param aButton Button that was pressed.
-       */
-    void MessageBoxClosed(const CHbDeviceMessageBoxSymbian* aMessageBox,
-          CHbDeviceMessageBoxSymbian::TButtonId aButton);
 
 protected:
 
@@ -80,6 +72,13 @@
     void Cancel();
 
     /**
+     * From CUSBUINotifierBase. Gets called when a request completes.
+     * @param None.
+     * @return None.
+     */
+    void RunL();
+
+    /**
      * From CUSBUINotifierBase. Used in asynchronous notifier launch to 
      * store received parameters into members variables and 
      * make needed initializations.
@@ -88,7 +87,7 @@
      * @param aMessage Should be completed when the notifier is deactivated.
      * @return None.
      */
-    void StartDialogL(const TDesC8& aBuffer, TInt aReplySlot,
+    void GetParamsL(const TDesC8& aBuffer, TInt aReplySlot,
             const RMessagePtr2& aMessage);
 
 private:
@@ -98,12 +97,25 @@
      */
     CUsbUiNotifOtgWarning();
 
+    /**
+     * Publish the dialog to the cover UI
+     * The cover UI may use the personality ID or the localized
+     * personality name e.g. "Mass storage". 
+     * @param aNote           The dialog to be published.
+     * @param aPersonalityId  The personality ID.
+     * @param aLocalizedPersonalityDescriptor The personality as a string.
+     */
+    void
+            PublishToCoverUiL(CAknResourceNoteDialog* aNote,
+                    TInt aPersonalityId,
+                    const HBufC* aLocalizedPersonalityDescriptor);
+
 private:
     // data
-    CDesCArrayFlat* iStringIds;
+    RArray<TInt> iStringIds;
 
     //Own
-    CHbDeviceMessageBoxSymbian* iNote;
+    CAknResourceNoteDialog* iNote;
 
     TInt iNoteId;
     };