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_tray_win.h" | 5 #include "chrome/browser/ui/views/status_icons/status_tray_win.h" |
6 | 6 |
7 #include "base/win/metro.h" | |
8 #include "base/win/wrapped_window_proc.h" | 7 #include "base/win/wrapped_window_proc.h" |
9 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" | 8 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" |
10 #include "chrome/common/chrome_constants.h" | 9 #include "chrome/common/chrome_constants.h" |
11 #include "ui/base/win/hwnd_util.h" | 10 #include "ui/base/win/hwnd_util.h" |
12 #include "ui/gfx/screen.h" | 11 #include "ui/gfx/screen.h" |
| 12 #include "win8/util/win8_util.h" |
13 | 13 |
14 static const UINT kStatusIconMessage = WM_APP + 1; | 14 static const UINT kStatusIconMessage = WM_APP + 1; |
15 | 15 |
16 StatusTrayWin::StatusTrayWin() | 16 StatusTrayWin::StatusTrayWin() |
17 : next_icon_id_(1), | 17 : next_icon_id_(1), |
18 atom_(0), | 18 atom_(0), |
19 instance_(NULL), | 19 instance_(NULL), |
20 window_(NULL) { | 20 window_(NULL) { |
21 // Register our window class | 21 // Register our window class |
22 WNDCLASSEX window_class; | 22 WNDCLASSEX window_class; |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 | 92 |
93 StatusTrayWin::~StatusTrayWin() { | 93 StatusTrayWin::~StatusTrayWin() { |
94 if (window_) | 94 if (window_) |
95 DestroyWindow(window_); | 95 DestroyWindow(window_); |
96 | 96 |
97 if (atom_) | 97 if (atom_) |
98 UnregisterClass(MAKEINTATOM(atom_), instance_); | 98 UnregisterClass(MAKEINTATOM(atom_), instance_); |
99 } | 99 } |
100 | 100 |
101 StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() { | 101 StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() { |
102 if (base::win::IsMetroProcess()) { | 102 if (win8::IsSingleWindowMetroMode()) { |
103 return new StatusIconMetro(next_icon_id_++); | 103 return new StatusIconMetro(next_icon_id_++); |
104 } else { | 104 } else { |
105 return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage); | 105 return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage); |
106 } | 106 } |
107 } | 107 } |
108 | 108 |
109 StatusTray* StatusTray::Create() { | 109 StatusTray* StatusTray::Create() { |
110 return new StatusTrayWin(); | 110 return new StatusTrayWin(); |
111 } | 111 } |
OLD | NEW |