| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <iterator> | 10 #include <iterator> |
| (...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1318 } | 1318 } |
| 1319 | 1319 |
| 1320 bool TabStrip::IsImmersiveStyle() const { | 1320 bool TabStrip::IsImmersiveStyle() const { |
| 1321 return immersive_style_; | 1321 return immersive_style_; |
| 1322 } | 1322 } |
| 1323 | 1323 |
| 1324 SkColor TabStrip::GetToolbarTopSeparatorColor() const { | 1324 SkColor TabStrip::GetToolbarTopSeparatorColor() const { |
| 1325 return controller_->GetToolbarTopSeparatorColor(); | 1325 return controller_->GetToolbarTopSeparatorColor(); |
| 1326 } | 1326 } |
| 1327 | 1327 |
| 1328 // Returns the accessible tab name for the tab. |
| 1329 base::string16 TabStrip::GetAccessibleTabName() const { |
| 1330 return controller_->GetAccessibleTabName(); |
| 1331 } |
| 1332 |
| 1328 int TabStrip::GetBackgroundResourceId(bool* custom_image) const { | 1333 int TabStrip::GetBackgroundResourceId(bool* custom_image) const { |
| 1329 const ui::ThemeProvider* tp = GetThemeProvider(); | 1334 const ui::ThemeProvider* tp = GetThemeProvider(); |
| 1330 | 1335 |
| 1331 if (GetWidget()->ShouldWindowContentsBeTransparent()) { | 1336 if (GetWidget()->ShouldWindowContentsBeTransparent()) { |
| 1332 const int kBackgroundIdGlass = IDR_THEME_TAB_BACKGROUND_V; | 1337 const int kBackgroundIdGlass = IDR_THEME_TAB_BACKGROUND_V; |
| 1333 *custom_image = tp->HasCustomImage(kBackgroundIdGlass); | 1338 *custom_image = tp->HasCustomImage(kBackgroundIdGlass); |
| 1334 return kBackgroundIdGlass; | 1339 return kBackgroundIdGlass; |
| 1335 } | 1340 } |
| 1336 | 1341 |
| 1337 // If a custom theme does not provide a replacement tab background, but does | 1342 // If a custom theme does not provide a replacement tab background, but does |
| (...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2804 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point); | 2809 ConvertPointToViewAndGetEventHandler(this, newtab_button_, point); |
| 2805 if (view) | 2810 if (view) |
| 2806 return view; | 2811 return view; |
| 2807 } | 2812 } |
| 2808 Tab* tab = FindTabForEvent(point); | 2813 Tab* tab = FindTabForEvent(point); |
| 2809 if (tab) | 2814 if (tab) |
| 2810 return ConvertPointToViewAndGetEventHandler(this, tab, point); | 2815 return ConvertPointToViewAndGetEventHandler(this, tab, point); |
| 2811 } | 2816 } |
| 2812 return this; | 2817 return this; |
| 2813 } | 2818 } |
| OLD | NEW |