OLD | NEW |
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 "ui/aura_shell/status_area_view.h" | 5 #include "ui/aura_shell/status_area_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
9 #include "ui/aura/desktop.h" | 9 #include "ui/aura/desktop.h" |
10 #include "ui/aura_shell/aura_shell_export.h" | 10 #include "ui/aura_shell/aura_shell_export.h" |
11 #include "ui/aura_shell/shell.h" | 11 #include "ui/aura_shell/shell.h" |
12 #include "ui/aura_shell/shell_window_ids.h" | 12 #include "ui/aura_shell/shell_window_ids.h" |
13 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" |
14 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
15 #include "views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
16 | 16 |
17 namespace aura_shell { | 17 namespace aura_shell { |
18 namespace internal { | 18 namespace internal { |
19 | 19 |
20 StatusAreaView::StatusAreaView() | 20 StatusAreaView::StatusAreaView() |
21 : status_mock_(*ResourceBundle::GetSharedInstance().GetBitmapNamed( | 21 : status_mock_(*ResourceBundle::GetSharedInstance().GetBitmapNamed( |
22 IDR_AURA_STATUS_MOCK)) { | 22 IDR_AURA_STATUS_MOCK)) { |
23 } | 23 } |
24 StatusAreaView::~StatusAreaView() { | 24 StatusAreaView::~StatusAreaView() { |
25 } | 25 } |
(...skipping 18 matching lines...) Expand all Loading... |
44 params.transparent = true; | 44 params.transparent = true; |
45 widget->Init(params); | 45 widget->Init(params); |
46 widget->SetContentsView(status_area_view); | 46 widget->SetContentsView(status_area_view); |
47 widget->Show(); | 47 widget->Show(); |
48 widget->GetNativeView()->set_name("StatusAreaView"); | 48 widget->GetNativeView()->set_name("StatusAreaView"); |
49 return widget; | 49 return widget; |
50 } | 50 } |
51 | 51 |
52 } // namespace internal | 52 } // namespace internal |
53 } // namespace aura_shell | 53 } // namespace aura_shell |
OLD | NEW |