| 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 "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/profiles/avatar_menu.h" | 9 #include "chrome/browser/profiles/avatar_menu.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 SkColor BrowserNonClientFrameView::GetToolbarTopSeparatorColor() const { | 58 SkColor BrowserNonClientFrameView::GetToolbarTopSeparatorColor() const { |
| 59 const auto color_id = | 59 const auto color_id = |
| 60 ShouldPaintAsActive() | 60 ShouldPaintAsActive() |
| 61 ? ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR | 61 ? ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR |
| 62 : ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE; | 62 : ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE; |
| 63 return ShouldPaintAsThemed() ? GetThemeProvider()->GetColor(color_id) | 63 return ShouldPaintAsThemed() ? GetThemeProvider()->GetColor(color_id) |
| 64 : ThemeProperties::GetDefaultColor( | 64 : ThemeProperties::GetDefaultColor( |
| 65 color_id, browser_view_->IsIncognito()); | 65 color_id, browser_view_->IsIncognito()); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void BrowserNonClientFrameView::UpdateToolbar() { | |
| 69 } | |
| 70 | |
| 71 views::View* BrowserNonClientFrameView::GetLocationIconView() const { | |
| 72 return nullptr; | |
| 73 } | |
| 74 | |
| 75 views::View* BrowserNonClientFrameView::GetProfileSwitcherView() const { | 68 views::View* BrowserNonClientFrameView::GetProfileSwitcherView() const { |
| 76 return nullptr; | 69 return nullptr; |
| 77 } | 70 } |
| 78 | 71 |
| 79 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from, | 72 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from, |
| 80 bool is_visible) { | 73 bool is_visible) { |
| 81 // UpdateTaskbarDecoration() calls DrawTaskbarDecoration(), but that does | 74 // UpdateTaskbarDecoration() calls DrawTaskbarDecoration(), but that does |
| 82 // nothing if the window is not visible. So even if we've already gotten the | 75 // nothing if the window is not visible. So even if we've already gotten the |
| 83 // up-to-date decoration, we need to run the update procedure again here when | 76 // up-to-date decoration, we need to run the update procedure again here when |
| 84 // the window becomes visible. | 77 // the window becomes visible. |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 // safety. See crbug.com/313800. | 269 // safety. See crbug.com/313800. |
| 277 gfx::Image decoration; | 270 gfx::Image decoration; |
| 278 AvatarMenu::GetImageForMenuButton( | 271 AvatarMenu::GetImageForMenuButton( |
| 279 browser_view()->browser()->profile()->GetPath(), &decoration); | 272 browser_view()->browser()->profile()->GetPath(), &decoration); |
| 280 // This can happen if the user deletes the current profile. | 273 // This can happen if the user deletes the current profile. |
| 281 if (decoration.IsEmpty()) | 274 if (decoration.IsEmpty()) |
| 282 return; | 275 return; |
| 283 chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), &decoration); | 276 chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), &decoration); |
| 284 #endif | 277 #endif |
| 285 } | 278 } |
| OLD | NEW |