| 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/glass_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // GlassBrowserFrameView, public: | 84 // GlassBrowserFrameView, public: |
| 85 | 85 |
| 86 GlassBrowserFrameView::GlassBrowserFrameView(BrowserFrame* frame, | 86 GlassBrowserFrameView::GlassBrowserFrameView(BrowserFrame* frame, |
| 87 BrowserView* browser_view) | 87 BrowserView* browser_view) |
| 88 : BrowserNonClientFrameView(frame, browser_view), | 88 : BrowserNonClientFrameView(frame, browser_view), |
| 89 profile_switcher_(this), | 89 profile_switcher_(this), |
| 90 throbber_running_(false), | 90 throbber_running_(false), |
| 91 throbber_frame_(0) { | 91 throbber_frame_(0) { |
| 92 if (browser_view->ShouldShowWindowIcon()) | 92 if (browser_view->ShouldShowWindowIcon()) |
| 93 InitThrobberIcons(); | 93 InitThrobberIcons(); |
| 94 | |
| 95 UpdateAvatar(); | |
| 96 } | 94 } |
| 97 | 95 |
| 98 GlassBrowserFrameView::~GlassBrowserFrameView() { | 96 GlassBrowserFrameView::~GlassBrowserFrameView() { |
| 99 } | 97 } |
| 100 | 98 |
| 101 /////////////////////////////////////////////////////////////////////////////// | 99 /////////////////////////////////////////////////////////////////////////////// |
| 102 // GlassBrowserFrameView, BrowserNonClientFrameView implementation: | 100 // GlassBrowserFrameView, BrowserNonClientFrameView implementation: |
| 103 | 101 |
| 104 gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip( | 102 gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip( |
| 105 views::View* tabstrip) const { | 103 views::View* tabstrip) const { |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 static bool initialized = false; | 649 static bool initialized = false; |
| 652 if (!initialized) { | 650 if (!initialized) { |
| 653 for (int i = 0; i < kThrobberIconCount; ++i) { | 651 for (int i = 0; i < kThrobberIconCount; ++i) { |
| 654 throbber_icons_[i] = | 652 throbber_icons_[i] = |
| 655 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); | 653 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); |
| 656 DCHECK(throbber_icons_[i]); | 654 DCHECK(throbber_icons_[i]); |
| 657 } | 655 } |
| 658 initialized = true; | 656 initialized = true; |
| 659 } | 657 } |
| 660 } | 658 } |
| OLD | NEW |