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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/brightness_observer.h" 5 #include "chrome/browser/chromeos/brightness_observer.h"
6 6 #if !defined(USE_AURA)
7 #include "chrome/browser/chromeos/brightness_bubble.h" 7 #include "chrome/browser/chromeos/brightness_bubble.h"
8 #include "chrome/browser/chromeos/volume_bubble.h" 8 #include "chrome/browser/chromeos/volume_bubble.h"
9 #else
10 #include "chrome/browser/chromeos/brightness_bubble_view_views.h"
11 #include "chrome/browser/chromeos/volume_bubble_view_views.h"
12 #endif
9 13
10 namespace chromeos { 14 namespace chromeos {
11 15
12 void BrightnessObserver::BrightnessChanged(int level, bool user_initiated) { 16 void BrightnessObserver::BrightnessChanged(int level, bool user_initiated) {
13 if (user_initiated) 17 if (user_initiated)
14 BrightnessBubble::GetInstance()->ShowBubble(level, true); 18 BrightnessBubble::GetInstance()->ShowBubble(level, true);
15 else 19 else
16 BrightnessBubble::GetInstance()->UpdateWithoutShowingBubble(level, true); 20 BrightnessBubble::GetInstance()->UpdateWithoutShowingBubble(level, true);
17 21
18 VolumeBubble::GetInstance()->HideBubble(); 22 VolumeBubble::GetInstance()->HideBubble();
19 } 23 }
20 24
21 } // namespace chromeos 25 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698