| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 return browser->window()->GetNativeHandle(); | 174 return browser->window()->GetNativeHandle(); |
| 175 } | 175 } |
| 176 #endif // defined(OS_CHROMEOS) | 176 #endif // defined(OS_CHROMEOS) |
| 177 | 177 |
| 178 /////////////////////////////////////////////////////////////////////////////// | 178 /////////////////////////////////////////////////////////////////////////////// |
| 179 // BookmarkExtensionBackground, private: | 179 // BookmarkExtensionBackground, private: |
| 180 // This object serves as the views::Background object which is used to layout | 180 // This object serves as the views::Background object which is used to layout |
| 181 // and paint the bookmark bar. | 181 // and paint the bookmark bar. |
| 182 class BookmarkExtensionBackground : public views::Background { | 182 class BookmarkExtensionBackground : public views::Background { |
| 183 public: | 183 public: |
| 184 explicit BookmarkExtensionBackground(BrowserView* browser_view, | 184 BookmarkExtensionBackground(BrowserView* browser_view, |
| 185 DetachableToolbarView* host_view, | 185 DetachableToolbarView* host_view, |
| 186 Browser* browser); | 186 Browser* browser); |
| 187 | 187 |
| 188 // View methods overridden from views:Background. | 188 // View methods overridden from views:Background. |
| 189 virtual void Paint(gfx::Canvas* canvas, views::View* view) const; | 189 virtual void Paint(gfx::Canvas* canvas, views::View* view) const; |
| 190 | 190 |
| 191 private: | 191 private: |
| 192 BrowserView* browser_view_; | 192 BrowserView* browser_view_; |
| 193 | 193 |
| 194 // The view hosting this background. | 194 // The view hosting this background. |
| 195 DetachableToolbarView* host_view_; | 195 DetachableToolbarView* host_view_; |
| 196 | 196 |
| (...skipping 2450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2647 view->GetWidget()->non_client_view()->SetAccessibleName( | 2647 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2648 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2648 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2649 return view; | 2649 return view; |
| 2650 } | 2650 } |
| 2651 #endif | 2651 #endif |
| 2652 | 2652 |
| 2653 // static | 2653 // static |
| 2654 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2654 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2655 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2655 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2656 } | 2656 } |
| OLD | NEW |