| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 width() - kPopupBackgroundEdge->width(), top_spacing); | 498 width() - kPopupBackgroundEdge->width(), top_spacing); |
| 499 } | 499 } |
| 500 | 500 |
| 501 // For glass, we need to draw a black line below the location bar to separate | 501 // For glass, we need to draw a black line below the location bar to separate |
| 502 // it from the content area. For non-glass, the NonClientView draws the | 502 // it from the content area. For non-glass, the NonClientView draws the |
| 503 // toolbar background below the location bar for us. | 503 // toolbar background below the location bar for us. |
| 504 if (GetWindow()->GetNonClientView()->UseNativeFrame()) | 504 if (GetWindow()->GetNonClientView()->UseNativeFrame()) |
| 505 canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1); | 505 canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1); |
| 506 } | 506 } |
| 507 | 507 |
| 508 void ToolbarView::ThemeChanged() { | 508 void ToolbarView::OnThemeChanged() { |
| 509 LoadImages(); | 509 LoadImages(); |
| 510 } | 510 } |
| 511 | 511 |
| 512 //////////////////////////////////////////////////////////////////////////////// | 512 //////////////////////////////////////////////////////////////////////////////// |
| 513 // ToolbarView, protected: | 513 // ToolbarView, protected: |
| 514 | 514 |
| 515 // Override this so that when the user presses F6 to rotate toolbar panes, | 515 // Override this so that when the user presses F6 to rotate toolbar panes, |
| 516 // the location bar gets focus, not the first control in the toolbar. | 516 // the location bar gets focus, not the first control in the toolbar. |
| 517 views::View* ToolbarView::GetDefaultFocusableChild() { | 517 views::View* ToolbarView::GetDefaultFocusableChild() { |
| 518 return location_bar_; | 518 return location_bar_; |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 } | 662 } |
| 663 #endif | 663 #endif |
| 664 | 664 |
| 665 // Tell the menu button to activate, opening its pop-up menu. | 665 // Tell the menu button to activate, opening its pop-up menu. |
| 666 menu_button->Activate(); | 666 menu_button->Activate(); |
| 667 | 667 |
| 668 #if defined(OS_WIN) | 668 #if defined(OS_WIN) |
| 669 SetToolbarFocus(NULL, menu_button); | 669 SetToolbarFocus(NULL, menu_button); |
| 670 #endif | 670 #endif |
| 671 } | 671 } |
| OLD | NEW |