| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/status_icons/status_icon_win.h" | 5 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" |
| 6 | 6 |
| 7 #include "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
| 8 #include "base/win/metro.h" | 8 #include "base/win/metro.h" |
| 9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| 11 #include "ui/gfx/icon_util.h" | 11 #include "ui/gfx/icon_util.h" |
| 12 #include "ui/gfx/point.h" | 12 #include "ui/gfx/point.h" |
| 13 #include "ui/views/controls/menu/menu_item_view.h" | 13 #include "ui/views/controls/menu/menu_item_view.h" |
| 14 #include "ui/views/controls/menu/menu_model_adapter.h" | 14 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 15 #include "ui/views/controls/menu/menu_runner.h" | 15 #include "ui/views/controls/menu/menu_runner.h" |
| 16 #include "win8/util/win8_util.h" |
| 16 | 17 |
| 17 //////////////////////////////////////////////////////////////////////////////// | 18 //////////////////////////////////////////////////////////////////////////////// |
| 18 // StatusIconWin, public: | 19 // StatusIconWin, public: |
| 19 | 20 |
| 20 StatusIconWin::StatusIconWin(UINT id, HWND window, UINT message) | 21 StatusIconWin::StatusIconWin(UINT id, HWND window, UINT message) |
| 21 : icon_id_(id), | 22 : icon_id_(id), |
| 22 window_(window), | 23 window_(window), |
| 23 message_id_(message), | 24 message_id_(message), |
| 24 menu_model_(NULL) { | 25 menu_model_(NULL) { |
| 25 NOTIFYICONDATA icon_data; | 26 NOTIFYICONDATA icon_data; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 160 |
| 160 icon_data->hWnd = window_; | 161 icon_data->hWnd = window_; |
| 161 icon_data->uID = icon_id_; | 162 icon_data->uID = icon_id_; |
| 162 } | 163 } |
| 163 | 164 |
| 164 //////////////////////////////////////////////////////////////////////////////// | 165 //////////////////////////////////////////////////////////////////////////////// |
| 165 // StatusIconMetro | 166 // StatusIconMetro |
| 166 | 167 |
| 167 StatusIconMetro::StatusIconMetro(UINT id) | 168 StatusIconMetro::StatusIconMetro(UINT id) |
| 168 : id_(id) { | 169 : id_(id) { |
| 169 DCHECK(base::win::IsMetroProcess()); | 170 DCHECK(win8::IsSingleWindowMetroMode()); |
| 170 } | 171 } |
| 171 | 172 |
| 172 StatusIconMetro::~StatusIconMetro() { | 173 StatusIconMetro::~StatusIconMetro() { |
| 173 } | 174 } |
| 174 | 175 |
| 175 void StatusIconMetro::SetImage(const gfx::ImageSkia& image) { | 176 void StatusIconMetro::SetImage(const gfx::ImageSkia& image) { |
| 176 DVLOG(1) << __FUNCTION__; | 177 DVLOG(1) << __FUNCTION__; |
| 177 } | 178 } |
| 178 | 179 |
| 179 void StatusIconMetro::SetPressedImage(const gfx::ImageSkia& image) { | 180 void StatusIconMetro::SetPressedImage(const gfx::ImageSkia& image) { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 201 notification("", "", title.c_str(), contents.c_str(), L"", | 202 notification("", "", title.c_str(), contents.c_str(), L"", |
| 202 base::IntToString(id_).c_str(), NULL, NULL); | 203 base::IntToString(id_).c_str(), NULL, NULL); |
| 203 } | 204 } |
| 204 } | 205 } |
| 205 | 206 |
| 206 void StatusIconMetro::UpdatePlatformContextMenu(ui::MenuModel* menu) { | 207 void StatusIconMetro::UpdatePlatformContextMenu(ui::MenuModel* menu) { |
| 207 DVLOG(1) << __FUNCTION__ | 208 DVLOG(1) << __FUNCTION__ |
| 208 << " This functionality is not supported in Windows 8 metro"; | 209 << " This functionality is not supported in Windows 8 metro"; |
| 209 } | 210 } |
| 210 | 211 |
| OLD | NEW |