| 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(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #include "grit/chromium_strings.h" | 70 #include "grit/chromium_strings.h" |
| 71 #include "grit/generated_resources.h" | 71 #include "grit/generated_resources.h" |
| 72 #include "grit/locale_settings.h" | 72 #include "grit/locale_settings.h" |
| 73 #include "grit/theme_resources.h" | 73 #include "grit/theme_resources.h" |
| 74 #include "grit/webkit_resources.h" | 74 #include "grit/webkit_resources.h" |
| 75 #include "ui/base/l10n/l10n_util.h" | 75 #include "ui/base/l10n/l10n_util.h" |
| 76 #include "ui/base/resource/resource_bundle.h" | 76 #include "ui/base/resource/resource_bundle.h" |
| 77 #include "views/controls/single_split_view.h" | 77 #include "views/controls/single_split_view.h" |
| 78 #include "views/focus/external_focus_tracker.h" | 78 #include "views/focus/external_focus_tracker.h" |
| 79 #include "views/focus/view_storage.h" | 79 #include "views/focus/view_storage.h" |
| 80 #include "views/grid_layout.h" | 80 #include "views/layout/grid_layout.h" |
| 81 #include "views/widget/root_view.h" | 81 #include "views/widget/root_view.h" |
| 82 #include "views/window/dialog_delegate.h" | 82 #include "views/window/dialog_delegate.h" |
| 83 #include "views/window/window.h" | 83 #include "views/window/window.h" |
| 84 | 84 |
| 85 #if defined(OS_WIN) | 85 #if defined(OS_WIN) |
| 86 #include "app/win/win_util.h" | 86 #include "app/win/win_util.h" |
| 87 #include "chrome/browser/aeropeek_manager.h" | 87 #include "chrome/browser/aeropeek_manager.h" |
| 88 #include "chrome/browser/jumplist_win.h" | 88 #include "chrome/browser/jumplist_win.h" |
| 89 #include "ui/base/view_prop.h" | 89 #include "ui/base/view_prop.h" |
| 90 #elif defined(OS_LINUX) | 90 #elif defined(OS_LINUX) |
| (...skipping 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2564 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2564 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2565 | 2565 |
| 2566 return view; | 2566 return view; |
| 2567 } | 2567 } |
| 2568 #endif | 2568 #endif |
| 2569 | 2569 |
| 2570 // static | 2570 // static |
| 2571 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2571 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2572 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2572 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2573 } | 2573 } |
| OLD | NEW |