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/frame/browser_non_client_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
6 | 6 |
7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/profiles/avatar_menu.h" | 8 #include "chrome/browser/profiles/avatar_menu.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 10 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
11 #include "chrome/browser/profiles/profile_info_cache.h" | 11 #include "chrome/browser/profiles/profile_info_cache.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/profiles/profiles_state.h" | 13 #include "chrome/browser/profiles/profiles_state.h" |
14 #include "chrome/browser/themes/theme_properties.h" | 14 #include "chrome/browser/themes/theme_properties.h" |
| 15 #include "chrome/browser/ui/host_desktop.h" |
15 #include "chrome/browser/ui/view_ids.h" | 16 #include "chrome/browser/ui/view_ids.h" |
16 #include "chrome/browser/ui/views/frame/browser_view.h" | 17 #include "chrome/browser/ui/views/frame/browser_view.h" |
17 #include "chrome/browser/ui/views/frame/taskbar_decorator.h" | 18 #include "chrome/browser/ui/views/frame/taskbar_decorator.h" |
18 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" | 19 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
19 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" | 20 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" |
20 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 21 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
21 #include "chrome/browser/ui/views/theme_image_mapper.h" | 22 #include "chrome/browser/ui/views/theme_image_mapper.h" |
22 #include "components/signin/core/common/profile_management_switches.h" | 23 #include "components/signin/core/common/profile_management_switches.h" |
23 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
24 #include "third_party/skia/include/core/SkColor.h" | 25 #include "third_party/skia/include/core/SkColor.h" |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 const ProfileInfoCache& cache = | 318 const ProfileInfoCache& cache = |
318 g_browser_process->profile_manager()->GetProfileInfoCache(); | 319 g_browser_process->profile_manager()->GetProfileInfoCache(); |
319 show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1; | 320 show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1; |
320 } | 321 } |
321 chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), | 322 chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), |
322 show_decoration | 323 show_decoration |
323 ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar) | 324 ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar) |
324 : nullptr); | 325 : nullptr); |
325 } | 326 } |
326 } | 327 } |
OLD | NEW |