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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 // button the same way to match. | 546 // button the same way to match. |
547 button_y -= 1; | 547 button_y -= 1; |
548 } | 548 } |
549 profile_switcher_.view()->SetBounds(button_x, button_y, label_size.width(), | 549 profile_switcher_.view()->SetBounds(button_x, button_y, label_size.width(), |
550 kProfileSwitcherButtonHeight); | 550 kProfileSwitcherButtonHeight); |
551 } | 551 } |
552 | 552 |
553 void GlassBrowserFrameView::LayoutIncognitoIcon() { | 553 void GlassBrowserFrameView::LayoutIncognitoIcon() { |
554 const bool md = ui::MaterialDesignController::IsModeMaterial(); | 554 const bool md = ui::MaterialDesignController::IsModeMaterial(); |
555 const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON)); | 555 const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON)); |
556 const gfx::Size size(GetOTRAvatarIcon().size()); | 556 const gfx::Size size(GetIncognitoAvatarIcon().size()); |
557 int x = ClientBorderThickness(false); | 557 int x = ClientBorderThickness(false); |
558 // In RTL, the icon needs to start after the caption buttons. | 558 // In RTL, the icon needs to start after the caption buttons. |
559 if (CaptionButtonsOnLeadingEdge()) { | 559 if (CaptionButtonsOnLeadingEdge()) { |
560 x = width() - frame()->GetMinimizeButtonOffset() + | 560 x = width() - frame()->GetMinimizeButtonOffset() + |
561 (profile_switcher_.view() ? (profile_switcher_.view()->width() + | 561 (profile_switcher_.view() ? (profile_switcher_.view()->width() + |
562 kProfileSwitcherButtonOffset) | 562 kProfileSwitcherButtonOffset) |
563 : 0); | 563 : 0); |
564 } else if (!md && !profile_indicator_icon() && IsToolbarVisible() && | 564 } else if (!md && !profile_indicator_icon() && IsToolbarVisible() && |
565 (base::win::GetVersion() < base::win::VERSION_WIN10)) { | 565 (base::win::GetVersion() < base::win::VERSION_WIN10)) { |
566 // In non-MD before Win 10, the toolbar has a rounded corner that we don't | 566 // In non-MD before Win 10, the toolbar has a rounded corner that we don't |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 static bool initialized = false; | 677 static bool initialized = false; |
678 if (!initialized) { | 678 if (!initialized) { |
679 for (int i = 0; i < kThrobberIconCount; ++i) { | 679 for (int i = 0; i < kThrobberIconCount; ++i) { |
680 throbber_icons_[i] = | 680 throbber_icons_[i] = |
681 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); | 681 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); |
682 DCHECK(throbber_icons_[i]); | 682 DCHECK(throbber_icons_[i]); |
683 } | 683 } |
684 initialized = true; | 684 initialized = true; |
685 } | 685 } |
686 } | 686 } |
OLD | NEW |