aura: brightness and volume bubble.

chrome/browser/chromeos/system_key_event_listener.cc

Index: chrome/browser/chromeos/system_key_event_listener.cc
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 6fe5279f28028f2b3b12c16514f05acb225f9a75..1b759cea4814525571c8d6e7f65d27c794adee31 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -12,13 +12,18 @@
 
 #include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/chromeos/audio_handler.h"
-#include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/input_method/hotkey_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#if !defined(USE_AURA)
+#include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/volume_bubble.h"
+#else
+#include "chrome/browser/chromeos/brightness_bubble_view_views.h"

[Daniel Erat, 2011/10/18 17:55:12]

I'm finding this pretty confusing (probably in large part because of the naming
-- the previous version of the brightness/volume/etc. bubble is already
Views-specific, no?).

I'd prefer that you just made the existing version of the code use your new
bubble class (maybe behind an ifdef, if you're not confident in your class yet).
 Duplicating all of the code like this seems messy.

[alicet1, 2011/10/19 14:59:16]

yes, removed, and replaced the original *_bubbles.

+#include "chrome/browser/chromeos/volume_bubble_view_views.h"
+#endif
 #include "content/browser/user_metrics.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/x/x11_util.h"