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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/brightness_observer.cc

Issue 8319008: aura: brightness and volume bubble. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 2 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
« chrome/browser/chromeos/brightness_bubble_view_views.cc ('K') | « chrome/browser/chromeos/brightness_bubble_view_views.cc ('k') | chrome/browser/chromeos/setting_level_bubble_view_views.h » ('j') | chrome/browser/chromeos/system_key_event_listener.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/brightness_observer.cc
diff --git a/chrome/browser/chromeos/brightness_observer.cc b/chrome/browser/chromeos/brightness_observer.cc
index e8dcebeee3a4696f65925c99323f19a3b27fb937..9be2b1fde167fe804ae25d969d805dae3485fd54 100644
--- a/chrome/browser/chromeos/brightness_observer.cc
+++ b/chrome/browser/chromeos/brightness_observer.cc
@@ -3,9 +3,13 @@
// found in the LICENSE file.
#include "chrome/browser/chromeos/brightness_observer.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"
+#include "chrome/browser/chromeos/volume_bubble_view_views.h"
+#endif
namespace chromeos {
« chrome/browser/chromeos/brightness_bubble_view_views.cc ('K') | « chrome/browser/chromeos/brightness_bubble_view_views.cc ('k') | chrome/browser/chromeos/setting_level_bubble_view_views.h » ('j') | chrome/browser/chromeos/system_key_event_listener.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698