chromeos: Move audio, power, and UI files into subdirs.

This moves more files from chrome/browser/chromeos/ into
subdirectories.

BUG=chromium-os:22896
TEST=did chrome os builds both with and without aura
TBR=sky

Review URL: http://codereview.chromium.org/9125006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116746 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 57 insertions, 61 deletions

diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 0a91757..fd64419 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/audio_handler.h"
+#include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/audio_handler.cc b/chrome/browser/chromeos/audio/audio_handler.cc
index ffb57fe..062ac1b 100644
--- a/chrome/browser/chromeos/audio_handler.cc
+++ b/chrome/browser/chromeos/audio/audio_handler.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/audio_handler.h"
+#include "chrome/browser/chromeos/audio/audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "chrome/browser/chromeos/audio_mixer_alsa.h"
+#include "chrome/browser/chromeos/audio/audio_mixer_alsa.h"
 #include "content/public/browser/browser_thread.h"
 
 using std::max;
diff --git a/chrome/browser/chromeos/audio_handler.h b/chrome/browser/chromeos/audio/audio_handler.h
index 0051a07..9ad9ddc 100644
--- a/chrome/browser/chromeos/audio_handler.h
+++ b/chrome/browser/chromeos/audio/audio_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_
+#define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -64,4 +64,4 @@ class AudioHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_
diff --git a/chrome/browser/chromeos/audio_mixer.h b/chrome/browser/chromeos/audio/audio_mixer.h
index ba88736..dd09065 100644
--- a/chrome/browser/chromeos/audio_mixer.h
+++ b/chrome/browser/chromeos/audio/audio_mixer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
-#define CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_H_
+#define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -51,4 +51,4 @@ class AudioMixer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_H_
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.cc b/chrome/browser/chromeos/audio/audio_mixer_alsa.cc
index 3bdc1e4..558aae3 100644
--- a/chrome/browser/chromeos/audio_mixer_alsa.cc
+++ b/chrome/browser/chromeos/audio/audio_mixer_alsa.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/audio_mixer_alsa.h"
+#include "chrome/browser/chromeos/audio/audio_mixer_alsa.h"
 
 #include <unistd.h>
 
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.h b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
index 5bd7fc0..e8e629b 100644
--- a/chrome/browser/chromeos/audio_mixer_alsa.h
+++ b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_ALSA_H_
-#define CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_ALSA_H_
+#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_ALSA_H_
+#define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_ALSA_H_
 #pragma once
 
 #include <string>
@@ -14,7 +14,7 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/chromeos/audio_mixer.h"
+#include "chrome/browser/chromeos/audio/audio_mixer.h"
 
 class PrefService;
 
@@ -126,4 +126,4 @@ class AudioMixerAlsa : public AudioMixer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_ALSA_H_
+#endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_ALSA_H_
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 8c6cb74..d84e2f9 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -12,12 +12,10 @@
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/chromeos/accessibility/system_event_observer.h"
-#include "chrome/browser/chromeos/audio_handler.h"
-#include "chrome/browser/chromeos/audio_handler.h"
+#include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/brightness_observer.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
@@ -35,6 +33,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
+#include "chrome/browser/chromeos/power/brightness_observer.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
diff --git a/chrome/browser/chromeos/brightness_observer.cc b/chrome/browser/chromeos/power/brightness_observer.cc
index e8dcebe..201ab45 100644
--- a/chrome/browser/chromeos/brightness_observer.cc
+++ b/chrome/browser/chromeos/power/brightness_observer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/brightness_observer.h"
+#include "chrome/browser/chromeos/power/brightness_observer.h"
 
-#include "chrome/browser/chromeos/brightness_bubble.h"
-#include "chrome/browser/chromeos/volume_bubble.h"
+#include "chrome/browser/chromeos/ui/brightness_bubble.h"
+#include "chrome/browser/chromeos/ui/volume_bubble.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/brightness_observer.h b/chrome/browser/chromeos/power/brightness_observer.h
index b18a9a5..39e2d4b 100644
--- a/chrome/browser/chromeos/brightness_observer.h
+++ b/chrome/browser/chromeos/power/brightness_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_BRIGHTNESS_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_BRIGHTNESS_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POWER_BRIGHTNESS_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_POWER_BRIGHTNESS_OBSERVER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -28,4 +28,4 @@ class BrightnessObserver : public PowerManagerClient::Observer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_BRIGHTNESS_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POWER_BRIGHTNESS_OBSERVER_H_
diff --git a/chrome/browser/chromeos/low_battery_observer.cc b/chrome/browser/chromeos/power/low_battery_observer.cc
index ee660ff..2fe0333 100644
--- a/chrome/browser/chromeos/low_battery_observer.cc
+++ b/chrome/browser/chromeos/power/low_battery_observer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/low_battery_observer.h"
+#include "chrome/browser/chromeos/power/low_battery_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/chromeos/low_battery_observer.h b/chrome/browser/chromeos/power/low_battery_observer.h
index 49f41db..dc4fc0c 100644
--- a/chrome/browser/chromeos/low_battery_observer.h
+++ b/chrome/browser/chromeos/power/low_battery_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOW_BATTERY_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_LOW_BATTERY_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POWER_LOW_BATTERY_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_POWER_LOW_BATTERY_OBSERVER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -16,9 +16,7 @@ class Profile;
 
 namespace chromeos {
 
-// The low battery observer displays a system notification when the battery
-// is low.
-
+// Displays a system notification when the battery is low.
 class LowBatteryObserver : public PowerManagerClient::Observer {
  public:
   explicit LowBatteryObserver(Profile* profile);
@@ -38,4 +36,4 @@ class LowBatteryObserver : public PowerManagerClient::Observer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOW_BATTERY_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POWER_LOW_BATTERY_OBSERVER_H_
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 7048766..6740eaf 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -10,14 +10,14 @@
 #include <X11/XKBlib.h>
 
 #include "chrome/browser/accessibility/accessibility_events.h"
-#include "chrome/browser/chromeos/audio_handler.h"
-#include "chrome/browser/chromeos/brightness_bubble.h"
+#include "chrome/browser/chromeos/audio/audio_handler.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"
-#include "chrome/browser/chromeos/volume_bubble.h"
+#include "chrome/browser/chromeos/ui/brightness_bubble.h"
+#include "chrome/browser/chromeos/ui/volume_bubble.h"
 #include "content/public/browser/user_metrics.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/x/x11_util.h"
diff --git a/chrome/browser/chromeos/brightness_bubble.cc b/chrome/browser/chromeos/ui/brightness_bubble.cc
index 7c149aac..ac4c15d 100644
--- a/chrome/browser/chromeos/brightness_bubble.cc
+++ b/chrome/browser/chromeos/ui/brightness_bubble.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/brightness_bubble.h"
+#include "chrome/browser/chromeos/ui/brightness_bubble.h"
 
 #include "base/memory/singleton.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/chromeos/brightness_bubble.h b/chrome/browser/chromeos/ui/brightness_bubble.h
index 7b5ed8c..02738a0 100644
--- a/chrome/browser/chromeos/brightness_bubble.h
+++ b/chrome/browser/chromeos/ui/brightness_bubble.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_BRIGHTNESS_BUBBLE_H_
-#define CHROME_BROWSER_CHROMEOS_BRIGHTNESS_BUBBLE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_UI_BRIGHTNESS_BUBBLE_H_
+#define CHROME_BROWSER_CHROMEOS_UI_BRIGHTNESS_BUBBLE_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/setting_level_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
@@ -29,4 +29,4 @@ class BrightnessBubble : public SettingLevelBubble {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_BRIGHTNESS_BUBBLE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_UI_BRIGHTNESS_BUBBLE_H_
diff --git a/chrome/browser/chromeos/brightness_bubble_browsertest.cc b/chrome/browser/chromeos/ui/brightness_bubble_browsertest.cc
index e6d837a..57c584f 100644
--- a/chrome/browser/chromeos/brightness_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/ui/brightness_bubble_browsertest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/brightness_bubble.h"
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
+#include "chrome/browser/chromeos/ui/brightness_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/views/view.h"
 
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/ui/setting_level_bubble.cc
index 2f3b9ed..5d0cdf1 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/ui/setting_level_bubble.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/setting_level_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble.h"
 
 #include <algorithm>
 
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/chromeos/setting_level_bubble.h b/chrome/browser/chromeos/ui/setting_level_bubble.h
index 543a76d..19f654c 100644
--- a/chrome/browser/chromeos/setting_level_bubble.h
+++ b/chrome/browser/chromeos/ui/setting_level_bubble.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_
-#define CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_H_
+#define CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -123,4 +123,4 @@ class SettingLevelBubble : public views::Widget::Observer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_H_
diff --git a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc b/chrome/browser/chromeos/ui/setting_level_bubble_browsertest.cc
index 4c1b543..a732357 100644
--- a/chrome/browser/chromeos/setting_level_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/ui/setting_level_bubble_browsertest.cc
@@ -3,14 +3,13 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/setting_level_bubble.h"
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/view.h"
 
-
 class SettingLevelBubbleTest : public InProcessBrowserTest {
  public:
   SettingLevelBubbleTest() {
diff --git a/chrome/browser/chromeos/setting_level_bubble_view.cc b/chrome/browser/chromeos/ui/setting_level_bubble_view.cc
index 53c6b1e..e39296f 100644
--- a/chrome/browser/chromeos/setting_level_bubble_view.cc
+++ b/chrome/browser/chromeos/ui/setting_level_bubble_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble_view.h"
 
 #include <string>
 
diff --git a/chrome/browser/chromeos/setting_level_bubble_view.h b/chrome/browser/chromeos/ui/setting_level_bubble_view.h
index a9c07f5..88f1238 100644
--- a/chrome/browser/chromeos/setting_level_bubble_view.h
+++ b/chrome/browser/chromeos/ui/setting_level_bubble_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_VIEW_H_
+#ifndef CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_VIEW_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
@@ -54,4 +54,4 @@ class SettingLevelBubbleView : public views::View {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_VIEW_H_
+#endif  // CHROME_BROWSER_CHROMEOS_UI_SETTING_LEVEL_BUBBLE_VIEW_H_
diff --git a/chrome/browser/chromeos/volume_bubble.cc b/chrome/browser/chromeos/ui/volume_bubble.cc
index d5c8c97..3801929 100644
--- a/chrome/browser/chromeos/volume_bubble.cc
+++ b/chrome/browser/chromeos/ui/volume_bubble.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/volume_bubble.h"
+#include "chrome/browser/chromeos/ui/volume_bubble.h"
 
 #include "base/memory/singleton.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/chromeos/volume_bubble.h b/chrome/browser/chromeos/ui/volume_bubble.h
index 17f72fc..1c976aa 100644
--- a/chrome/browser/chromeos/volume_bubble.h
+++ b/chrome/browser/chromeos/ui/volume_bubble.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_VOLUME_BUBBLE_H_
-#define CHROME_BROWSER_CHROMEOS_VOLUME_BUBBLE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_UI_VOLUME_BUBBLE_H_
+#define CHROME_BROWSER_CHROMEOS_UI_VOLUME_BUBBLE_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/setting_level_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
@@ -29,4 +29,4 @@ class VolumeBubble : public SettingLevelBubble {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_VOLUME_BUBBLE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_UI_VOLUME_BUBBLE_H_
diff --git a/chrome/browser/chromeos/volume_bubble_browsertest.cc b/chrome/browser/chromeos/ui/volume_bubble_browsertest.cc
index 3c3d371..2fa3d75 100644
--- a/chrome/browser/chromeos/volume_bubble_browsertest.cc
+++ b/chrome/browser/chromeos/ui/volume_bubble_browsertest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/setting_level_bubble_view.h"
-#include "chrome/browser/chromeos/volume_bubble.h"
+#include "chrome/browser/chromeos/ui/setting_level_bubble_view.h"
+#include "chrome/browser/chromeos/ui/volume_bubble.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/views/view.h"
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 47d6593..7177e31 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -82,7 +82,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/audio_mixer_alsa.h"
+#include "chrome/browser/chromeos/audio/audio_mixer_alsa.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/signed_settings_cache.h"
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index b02abbe..24dac33 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -107,8 +107,8 @@
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
-#include "chrome/browser/chromeos/low_battery_observer.h"
 #include "chrome/browser/chromeos/network_message_observer.h"
+#include "chrome/browser/chromeos/power/low_battery_observer.h"
 #include "chrome/browser/chromeos/sms_observer.h"
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"