| 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 "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { | 293 static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { |
| 294 mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; | 294 mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; |
| 295 } | 295 } |
| 296 browser_view()->ShowAvatarBubbleFromAvatarButton( | 296 browser_view()->ShowAvatarBubbleFromAvatarButton( |
| 297 mode, | 297 mode, |
| 298 signin::ManageAccountsParams()); | 298 signin::ManageAccountsParams()); |
| 299 } | 299 } |
| 300 } | 300 } |
| 301 | 301 |
| 302 // BrowserNonClientFrameView: | 302 // BrowserNonClientFrameView: |
| 303 void GlassBrowserFrameView::UpdateNewStyleAvatar() { | 303 void GlassBrowserFrameView::UpdateNewAvatarButtonImpl() { |
| 304 UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON); | 304 UpdateNewAvatarButton(this, NewAvatarButton::NATIVE_BUTTON); |
| 305 } | 305 } |
| 306 | 306 |
| 307 /////////////////////////////////////////////////////////////////////////////// | 307 /////////////////////////////////////////////////////////////////////////////// |
| 308 // GlassBrowserFrameView, private: | 308 // GlassBrowserFrameView, private: |
| 309 | 309 |
| 310 // views::NonClientFrameView: | 310 // views::NonClientFrameView: |
| 311 bool GlassBrowserFrameView::DoesIntersectRect(const views::View* target, | 311 bool GlassBrowserFrameView::DoesIntersectRect(const views::View* target, |
| 312 const gfx::Rect& rect) const { | 312 const gfx::Rect& rect) const { |
| 313 CHECK_EQ(target, this); | 313 CHECK_EQ(target, this); |
| 314 bool hit_avatar_button = avatar_button() && | 314 bool hit_avatar_button = avatar_button() && |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 static bool initialized = false; | 602 static bool initialized = false; |
| 603 if (!initialized) { | 603 if (!initialized) { |
| 604 for (int i = 0; i < kThrobberIconCount; ++i) { | 604 for (int i = 0; i < kThrobberIconCount; ++i) { |
| 605 throbber_icons_[i] = | 605 throbber_icons_[i] = |
| 606 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); | 606 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); |
| 607 DCHECK(throbber_icons_[i]); | 607 DCHECK(throbber_icons_[i]); |
| 608 } | 608 } |
| 609 initialized = true; | 609 initialized = true; |
| 610 } | 610 } |
| 611 } | 611 } |
| OLD | NEW |