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

Unified Diff: ash/system/bluetooth/tray_bluetooth.h

Issue 10235010: Prepare SystemTray to support notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 8 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: ash/system/bluetooth/tray_bluetooth.h
diff --git a/ash/system/bluetooth/tray_bluetooth.h b/ash/system/bluetooth/tray_bluetooth.h
index ab9ca48aec8a0fb9c8ac0fd0be2c7491e767a4c7..73323b703b460da7afab00fab1aa7aa4f2542c5d 100644
--- a/ash/system/bluetooth/tray_bluetooth.h
+++ b/ash/system/bluetooth/tray_bluetooth.h
@@ -8,7 +8,6 @@
#include "ash/system/bluetooth/bluetooth_observer.h"
#include "ash/system/tray/system_tray_item.h"
-#include "base/memory/scoped_ptr.h"
namespace ash {
namespace internal {
@@ -37,8 +36,8 @@ class TrayBluetooth : public SystemTrayItem,
// Overridden from BluetoothObserver.
virtual void OnBluetoothRefresh() OVERRIDE;
- scoped_ptr<tray::BluetoothDefaultView> default_;
- scoped_ptr<tray::BluetoothDetailedView> detailed_;
+ tray::BluetoothDefaultView* default_;
+ tray::BluetoothDetailedView* detailed_;
DISALLOW_COPY_AND_ASSIGN(TrayBluetooth);
};

Powered by Google App Engine
This is Rietveld 408576698