Refactor chromeos status area files into subdirectory status

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/561077

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

25 files changed, 75 insertions, 75 deletions

diff --git a/chrome/browser/chromeos/browser_extenders.cc b/chrome/browser/chromeos/browser_extenders.cc
index a74ff04..be06eb2 100644
--- a/chrome/browser/chromeos/browser_extenders.cc
+++ b/chrome/browser/chromeos/browser_extenders.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/compact_location_bar_host.h"
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/chromeos/main_menu.h"
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
 #include "chrome/browser/views/frame/browser_view.h"
diff --git a/chrome/browser/chromeos/browser_view.cc b/chrome/browser/chromeos/browser_view.cc
index ec74458..8d5d49d 100644
--- a/chrome/browser/chromeos/browser_view.cc
+++ b/chrome/browser/chromeos/browser_view.cc
@@ -12,12 +12,12 @@
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/chromeos/browser_status_area_view.h"
 #include "chrome/browser/chromeos/compact_location_bar_host.h"
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/chromeos/main_menu.h"
 #include "chrome/browser/chromeos/panel_browser_view.h"
-#include "chrome/browser/chromeos/status_area_button.h"
+#include "chrome/browser/chromeos/status/browser_status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
diff --git a/chrome/browser/chromeos/browser_view.h b/chrome/browser/chromeos/browser_view.h
index e3fa12c..278e134 100644
--- a/chrome/browser/chromeos/browser_view.h
+++ b/chrome/browser/chromeos/browser_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_BROWSER_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_BROWSER_VIEW_H_
 
-#include "chrome/browser/chromeos/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "views/controls/button/button.h"
 
diff --git a/chrome/browser/chromeos/compact_navigation_bar.cc b/chrome/browser/chromeos/compact_navigation_bar.cc
index 6ba8e92..aeb36e2 100644
--- a/chrome/browser/chromeos/compact_navigation_bar.cc
+++ b/chrome/browser/chromeos/compact_navigation_bar.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/chromeos/login_wizard_view.cc b/chrome/browser/chromeos/login_wizard_view.cc
index 09f5f10..53b49a2 100644
--- a/chrome/browser/chromeos/login_wizard_view.cc
+++ b/chrome/browser/chromeos/login_wizard_view.cc
@@ -15,10 +15,10 @@
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/process_util.h"
-#include "chrome/browser/chromeos/clock_menu_button.h"
 #include "chrome/browser/chromeos/image_background.h"
 #include "chrome/browser/chromeos/login_library.h"
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/clock_menu_button.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/common/x11_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/login_wizard_view.h b/chrome/browser/chromeos/login_wizard_view.h
index 01d779f..f96a734 100644
--- a/chrome/browser/chromeos/login_wizard_view.h
+++ b/chrome/browser/chromeos/login_wizard_view.h
@@ -4,7 +4,7 @@
 
 #include "app/gfx/canvas.h"
 #include "chrome/browser/chromeos/login_manager_view.h"
-#include "chrome/browser/chromeos/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_host.h"
 #include "views/view.h"
 #include "views/window/window_delegate.h"
 
diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc
index eb3119be..58f36dc 100644
--- a/chrome/browser/chromeos/options/internet_page_view.cc
+++ b/chrome/browser/chromeos/options/internet_page_view.cc
@@ -8,7 +8,7 @@
 
 #include "app/combobox_model.h"
 #include "chrome/browser/chromeos/network_library.h"
-#include "chrome/browser/chromeos/password_dialog_view.h"
+#include "chrome/browser/chromeos/status/password_dialog_view.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/combobox/combobox.h"
diff --git a/chrome/browser/chromeos/browser_status_area_view.cc b/chrome/browser/chromeos/status/browser_status_area_view.cc
index d5f4ef0..18e2e00 100755
--- a/chrome/browser/chromeos/browser_status_area_view.cc
+++ b/chrome/browser/chromeos/status/browser_status_area_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/browser_status_area_view.h"
+#include "chrome/browser/chromeos/status/browser_status_area_view.h"
 
 #include "app/l10n_util.h"
 #include "app/theme_provider.h"
@@ -13,8 +13,8 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chromeos/browser_view.h"
-#include "chrome/browser/chromeos/status_area_button.h"
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/theme_background.h"
 #include "chrome/browser/views/toolbar_view.h"
diff --git a/chrome/browser/chromeos/browser_status_area_view.h b/chrome/browser/chromeos/status/browser_status_area_view.h
index 506630f..089eeda 100644
--- a/chrome/browser/chromeos/browser_status_area_view.h
+++ b/chrome/browser/chromeos/status/browser_status_area_view.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_BROWSER_STATUS_AREA_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_BROWSER_STATUS_AREA_VIEW_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_
 
 #include "app/menus/simple_menu_model.h"
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/view.h"
@@ -61,4 +61,4 @@ class BrowserStatusAreaView : public StatusAreaView,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_BROWSER_STATUS_AREA_VIEW_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_
diff --git a/chrome/browser/chromeos/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc
index 77159b3..450d379 100644
--- a/chrome/browser/chromeos/clock_menu_button.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button.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/clock_menu_button.h"
+#include "chrome/browser/chromeos/status/clock_menu_button.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
@@ -12,7 +12,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/chromeos/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 #include "unicode/calendar.h"
diff --git a/chrome/browser/chromeos/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h
index 09d3e9d..bdbf7e2 100644
--- a/chrome/browser/chromeos/clock_menu_button.h
+++ b/chrome/browser/chromeos/status/clock_menu_button.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_CLOCK_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
 
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
@@ -67,4 +67,4 @@ class ClockMenuButton : public views::MenuButton,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index 04741a2..f104ff2 100644
--- a/chrome/browser/chromeos/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.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/language_menu_button.h"
+#include "chrome/browser/chromeos/status/language_menu_button.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
-#include "chrome/browser/chromeos/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_host.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/chromeos/language_menu_button.h b/chrome/browser/chromeos/status/language_menu_button.h
index fd5285e..3fed634 100644
--- a/chrome/browser/chromeos/language_menu_button.h
+++ b/chrome/browser/chromeos/status/language_menu_button.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_LANGUAGE_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_LANGUAGE_MENU_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
 
 #include "app/menus/simple_menu_model.h"
 #include "chrome/browser/chromeos/language_library.h"
-#include "chrome/browser/chromeos/status_area_button.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
@@ -91,4 +91,4 @@ class LanguageMenuButton : public views::MenuButton,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LANGUAGE_MENU_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 2ed70de..4cbb37c 100644
--- a/chrome/browser/chromeos/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.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/network_menu_button.h"
+#include "chrome/browser/chromeos/status/network_menu_button.h"
 
 #include <limits>
 
diff --git a/chrome/browser/chromeos/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h
index 6126631..b38c142 100644
--- a/chrome/browser/chromeos/network_menu_button.h
+++ b/chrome/browser/chromeos/status/network_menu_button.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_NETWORK_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_NETWORK_MENU_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
 
 #include <string>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "app/throb_animation.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/network_library.h"
-#include "chrome/browser/chromeos/password_dialog_view.h"
-#include "chrome/browser/chromeos/status_area_button.h"
+#include "chrome/browser/chromeos/status/password_dialog_view.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
@@ -188,4 +188,4 @@ class NetworkMenuButton : public StatusAreaButton,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_MENU_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/password_dialog_view.cc b/chrome/browser/chromeos/status/password_dialog_view.cc
index 0d6f8a0..ad4edd4 100644
--- a/chrome/browser/chromeos/password_dialog_view.cc
+++ b/chrome/browser/chromeos/status/password_dialog_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/password_dialog_view.h"
+#include "chrome/browser/chromeos/status/password_dialog_view.h"
 
 #include "app/l10n_util.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/chromeos/password_dialog_view.h b/chrome/browser/chromeos/status/password_dialog_view.h
index e88a1fe..bb903c5 100644
--- a/chrome/browser/chromeos/password_dialog_view.h
+++ b/chrome/browser/chromeos/status/password_dialog_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_PASSWORD_DIALOG_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_PASSWORD_DIALOG_VIEW_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_PASSWORD_DIALOG_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_PASSWORD_DIALOG_VIEW_H_
 
 #include <string>
 
@@ -74,4 +74,4 @@ class PasswordDialogView : public views::View,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_PASSWORD_DIALOG_VIEW_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_PASSWORD_DIALOG_VIEW_H_
diff --git a/chrome/browser/chromeos/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index 49de470..de3eddb 100644
--- a/chrome/browser/chromeos/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.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/power_menu_button.h"
+#include "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/browser/chromeos/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index e8680b0..58612f3 100644
--- a/chrome/browser/chromeos/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.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_POWER_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_POWER_MENU_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
 
 #include "app/menus/menu_model.h"
 #include "chrome/browser/chromeos/power_library.h"
-#include "chrome/browser/chromeos/status_area_button.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
@@ -64,4 +64,4 @@ class PowerMenuButton : public StatusAreaButton,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_POWER_MENU_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc
index 57f66da..9a4a0f3 100644
--- a/chrome/browser/chromeos/status_area_button.cc
+++ b/chrome/browser/chromeos/status/status_area_button.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/status_area_button.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/skbitmap_operations.h"
diff --git a/chrome/browser/chromeos/status_area_button.h b/chrome/browser/chromeos/status/status_area_button.h
index 0647661..308f601 100644
--- a/chrome/browser/chromeos/status_area_button.h
+++ b/chrome/browser/chromeos/status/status_area_button.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_STATUS_AREA_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_AREA_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
 
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -29,4 +29,4 @@ class StatusAreaButton : public views::MenuButton {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_AREA_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
diff --git a/chrome/browser/chromeos/status_area_host.h b/chrome/browser/chromeos/status/status_area_host.h
index b4a4b25..606c041 100644
--- a/chrome/browser/chromeos/status_area_host.h
+++ b/chrome/browser/chromeos/status/status_area_host.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_STATUS_AREA_HOST_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_AREA_HOST_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_HOST_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_HOST_H_
 
 #include "app/gfx/native_widget_types.h"
 
@@ -37,5 +37,5 @@ class StatusAreaHost {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_AREA_HOST_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_HOST_H_
 
diff --git a/chrome/browser/chromeos/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index 1430156..e89a917 100755
--- a/chrome/browser/chromeos/status_area_view.cc
+++ b/chrome/browser/chromeos/status/status_area_view.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "chrome/browser/chromeos/clock_menu_button.h"
-#include "chrome/browser/chromeos/language_menu_button.h"
-#include "chrome/browser/chromeos/network_menu_button.h"
-#include "chrome/browser/chromeos/power_menu_button.h"
-#include "chrome/browser/chromeos/status_area_host.h"
+#include "chrome/browser/chromeos/status/clock_menu_button.h"
+#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/network_menu_button.h"
+#include "chrome/browser/chromeos/status/power_menu_button.h"
+#include "chrome/browser/chromeos/status/status_area_host.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
index 40741d0..d703cb7 100644
--- a/chrome/browser/chromeos/status_area_view.h
+++ b/chrome/browser/chromeos/status/status_area_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_STATUS_AREA_VIEW_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_AREA_VIEW_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
 
 #include "base/basictypes.h"
 #include "views/view.h"
@@ -62,4 +62,4 @@ class StatusAreaView : public views::View {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_AREA_VIEW_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index eebff54..8a53875 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -257,12 +257,8 @@
         'browser/chrome_thread.h',
         'browser/chromeos/browser_notification_observers.cc',
         'browser/chromeos/browser_extenders.cc',
-        'browser/chromeos/browser_status_area_view.cc',
-        'browser/chromeos/browser_status_area_view.h',
         'browser/chromeos/browser_view.cc',
         'browser/chromeos/browser_view.h',
-        'browser/chromeos/clock_menu_button.cc',
-        'browser/chromeos/clock_menu_button.h',
         'browser/chromeos/compact_location_bar_host.cc',
         'browser/chromeos/compact_location_bar_host.h',
         'browser/chromeos/compact_location_bar_view.cc',
@@ -282,8 +278,6 @@
         'browser/chromeos/ipc_message.h',
         'browser/chromeos/language_library.cc',
         'browser/chromeos/language_library.h',
-        'browser/chromeos/language_menu_button.cc',
-        'browser/chromeos/language_menu_button.h',
         'browser/chromeos/login_library.cc',
         'browser/chromeos/login_library.h',
         'browser/chromeos/login_manager_view.cc',
@@ -296,8 +290,6 @@
         'browser/chromeos/mount_library.h',
         'browser/chromeos/network_library.cc',
         'browser/chromeos/network_library.h',
-        'browser/chromeos/network_menu_button.cc',
-        'browser/chromeos/network_menu_button.h',
         'browser/chromeos/options/internet_page_view.cc',
         'browser/chromeos/options/internet_page_view.h',
         'browser/chromeos/options/settings_page_view.cc',
@@ -314,21 +306,29 @@
         'browser/chromeos/panels/panel_scroller_container.h',
         'browser/chromeos/panels/panel_scroller_header.cc',
         'browser/chromeos/panels/panel_scroller_header.h',
-        'browser/chromeos/password_dialog_view.cc',
-        'browser/chromeos/password_dialog_view.h',
         'browser/chromeos/pipe_reader.cc',
         'browser/chromeos/pipe_reader.h',
         'browser/chromeos/power_library.cc',
         'browser/chromeos/power_library.h',
-        'browser/chromeos/power_menu_button.cc',
-        'browser/chromeos/power_menu_button.h',
         'browser/chromeos/preferences.cc',
         'browser/chromeos/preferences.h',
-        'browser/chromeos/status_area_button.cc',
-        'browser/chromeos/status_area_button.h',
-        'browser/chromeos/status_area_host.h',
-        'browser/chromeos/status_area_view.cc',
-        'browser/chromeos/status_area_view.h',
+        'browser/chromeos/status/browser_status_area_view.cc',
+        'browser/chromeos/status/browser_status_area_view.h',
+        'browser/chromeos/status/clock_menu_button.cc',
+        'browser/chromeos/status/clock_menu_button.h',
+        'browser/chromeos/status/language_menu_button.cc',
+        'browser/chromeos/status/language_menu_button.h',
+        'browser/chromeos/status/network_menu_button.cc',
+        'browser/chromeos/status/network_menu_button.h',
+        'browser/chromeos/status/password_dialog_view.cc',
+        'browser/chromeos/status/password_dialog_view.h',
+        'browser/chromeos/status/power_menu_button.cc',
+        'browser/chromeos/status/power_menu_button.h',
+        'browser/chromeos/status/status_area_button.cc',
+        'browser/chromeos/status/status_area_button.h',
+        'browser/chromeos/status/status_area_host.h',
+        'browser/chromeos/status/status_area_view.cc',
+        'browser/chromeos/status/status_area_view.h',
         'browser/chromeos/synaptics_library.cc',
         'browser/chromeos/synaptics_library.h',
         'browser/chromeos/usb_mount_observer.cc',