diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
| commit | 55f59335f5983f427d3cad623034a6803a38c1ee (patch) | |
| tree | 48deb522fa9431e2b939941f2741dd5f8145206d /ash/status_area | |
| parent | 0d10f2cabb86eae1e0c71413b3c1b84ea77a75f2 (diff) | |
| download | chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.zip chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.gz chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.bz2 | |
Rename the aura_shell namespace to ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9033007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/status_area')
| -rw-r--r-- | ash/status_area/status_area_view.cc | 6 | ||||
| -rw-r--r-- | ash/status_area/status_area_view.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/status_area/status_area_view.cc b/ash/status_area/status_area_view.cc index 937ac58..c98cf9eb 100644 --- a/ash/status_area/status_area_view.cc +++ b/ash/status_area/status_area_view.cc @@ -14,7 +14,7 @@ #include "ui/gfx/canvas.h" #include "ui/views/widget/widget.h" -namespace aura_shell { +namespace ash { namespace internal { StatusAreaView::StatusAreaView() @@ -39,7 +39,7 @@ ASH_EXPORT views::Widget* CreateStatusArea() { gfx::Size ps = status_area_view->GetPreferredSize(); params.bounds = gfx::Rect(0, 0, ps.width(), ps.height()); params.parent = Shell::GetInstance()->GetContainer( - aura_shell::internal::kShellWindowId_StatusContainer); + ash::internal::kShellWindowId_StatusContainer); params.delegate = status_area_view; params.transparent = true; widget->Init(params); @@ -50,4 +50,4 @@ ASH_EXPORT views::Widget* CreateStatusArea() { } } // namespace internal -} // namespace aura_shell +} // namespace ash diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h index 7e7f8dc..e7788a1 100644 --- a/ash/status_area/status_area_view.h +++ b/ash/status_area/status_area_view.h @@ -9,7 +9,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/views/widget/widget_delegate.h" -namespace aura_shell { +namespace ash { namespace internal { class StatusAreaView : public views::WidgetDelegateView { @@ -29,6 +29,6 @@ class StatusAreaView : public views::WidgetDelegateView { }; } // namespace internal -} // namespace aura_shell +} // namespace ash #endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ |