| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/main/debug/debug_window.h" | 5 #include "athena/main/debug/debug_window.h" |
| 6 | 6 |
| 7 #include "athena/common/container_priorities.h" |
| 7 #include "athena/resources/athena_resources.h" | 8 #include "athena/resources/athena_resources.h" |
| 8 #include "athena/screen/public/screen_manager.h" | 9 #include "athena/screen/public/screen_manager.h" |
| 9 #include "base/bind.h" | 10 #include "base/bind.h" |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 13 #include "chromeos/dbus/dbus_thread_manager.h" | 14 #include "chromeos/dbus/dbus_thread_manager.h" |
| 14 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" | 15 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" |
| 15 #include "chromeos/dbus/power_manager_client.h" | 16 #include "chromeos/dbus/power_manager_client.h" |
| 16 #include "chromeos/network/network_state.h" | 17 #include "chromeos/network/network_state.h" |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 CreateBatteryView(); | 162 CreateBatteryView(); |
| 162 CreateNetworkView(); | 163 CreateNetworkView(); |
| 163 | 164 |
| 164 UpdateSize(); | 165 UpdateSize(); |
| 165 } | 166 } |
| 166 | 167 |
| 167 virtual ~DebugWidget() {} | 168 virtual ~DebugWidget() {} |
| 168 | 169 |
| 169 private: | 170 private: |
| 170 void CreateContainer() { | 171 void CreateContainer() { |
| 171 athena::ScreenManager::ContainerParams params("DebugContainer"); | 172 athena::ScreenManager::ContainerParams params("DebugContainer", |
| 173 athena::CP_DEBUG); |
| 172 container_ = athena::ScreenManager::Get()->CreateContainer(params); | 174 container_ = athena::ScreenManager::Get()->CreateContainer(params); |
| 173 } | 175 } |
| 174 | 176 |
| 175 void CreateWidget() { | 177 void CreateWidget() { |
| 176 views::Widget::InitParams params; | 178 views::Widget::InitParams params; |
| 177 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; | 179 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; |
| 178 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 180 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 179 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; | 181 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; |
| 180 params.accept_events = false; | 182 params.accept_events = false; |
| 181 params.bounds = gfx::Rect(200, 0, 100, 105); | 183 params.bounds = gfx::Rect(200, 0, 100, 105); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 scoped_ptr<NetworkStatus> network_status_; | 246 scoped_ptr<NetworkStatus> network_status_; |
| 245 | 247 |
| 246 DISALLOW_COPY_AND_ASSIGN(DebugWidget); | 248 DISALLOW_COPY_AND_ASSIGN(DebugWidget); |
| 247 }; | 249 }; |
| 248 | 250 |
| 249 } // namespace | 251 } // namespace |
| 250 | 252 |
| 251 void CreateDebugWindow() { | 253 void CreateDebugWindow() { |
| 252 new DebugWidget(); | 254 new DebugWidget(); |
| 253 } | 255 } |
| OLD | NEW |