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/tabs/tab_strip.h" | 5 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1261 Tab* active_tab = NULL; | 1261 Tab* active_tab = NULL; |
1262 Tabs tabs_dragging; | 1262 Tabs tabs_dragging; |
1263 Tabs selected_tabs; | 1263 Tabs selected_tabs; |
1264 | 1264 |
1265 { | 1265 { |
1266 const chrome::HostDesktopType host_desktop_type = | 1266 const chrome::HostDesktopType host_desktop_type = |
1267 chrome::GetHostDesktopTypeForNativeView(GetWidget()->GetNativeView()); | 1267 chrome::GetHostDesktopTypeForNativeView(GetWidget()->GetNativeView()); |
1268 const uint8_t inactive_tab_alpha = | 1268 const uint8_t inactive_tab_alpha = |
1269 (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) ? | 1269 (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) ? |
1270 GetInactiveAlpha(false) : 255; | 1270 GetInactiveAlpha(false) : 255; |
1271 ui::CompositingRecorder opacity_recorder(context, inactive_tab_alpha); | 1271 ui::CompositingRecorder opacity_recorder(context, size(), |
| 1272 inactive_tab_alpha); |
1272 | 1273 |
1273 PaintClosingTabs(tab_count(), context); | 1274 PaintClosingTabs(tab_count(), context); |
1274 | 1275 |
1275 int active_tab_index = -1; | 1276 int active_tab_index = -1; |
1276 for (int i = tab_count() - 1; i >= 0; --i) { | 1277 for (int i = tab_count() - 1; i >= 0; --i) { |
1277 Tab* tab = tab_at(i); | 1278 Tab* tab = tab_at(i); |
1278 if (tab->dragging() && !stacked_layout_) { | 1279 if (tab->dragging() && !stacked_layout_) { |
1279 is_dragging = true; | 1280 is_dragging = true; |
1280 if (tab->IsActive()) { | 1281 if (tab->IsActive()) { |
1281 active_tab = tab; | 1282 active_tab = tab; |
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2680 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point); | 2681 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point); |
2681 if (view) | 2682 if (view) |
2682 return view; | 2683 return view; |
2683 } | 2684 } |
2684 Tab* tab = FindTabForEvent(point); | 2685 Tab* tab = FindTabForEvent(point); |
2685 if (tab) | 2686 if (tab) |
2686 return ConvertPointToViewAndGetEventHandler(this, tab, point); | 2687 return ConvertPointToViewAndGetEventHandler(this, tab, point); |
2687 } | 2688 } |
2688 return this; | 2689 return this; |
2689 } | 2690 } |
OLD | NEW |