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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "chrome/browser/ui/views/toolbar_view.h" | 59 #include "chrome/browser/ui/views/toolbar_view.h" |
60 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 60 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
61 #include "chrome/browser/ui/views/window.h" | 61 #include "chrome/browser/ui/views/window.h" |
62 #include "chrome/browser/ui/window_sizer.h" | 62 #include "chrome/browser/ui/window_sizer.h" |
63 #include "chrome/common/chrome_switches.h" | 63 #include "chrome/common/chrome_switches.h" |
64 #include "chrome/common/extensions/extension_resource.h" | 64 #include "chrome/common/extensions/extension_resource.h" |
65 #include "chrome/common/native_window_notification_source.h" | 65 #include "chrome/common/native_window_notification_source.h" |
66 #include "chrome/common/notification_service.h" | 66 #include "chrome/common/notification_service.h" |
67 #include "chrome/common/pref_names.h" | 67 #include "chrome/common/pref_names.h" |
68 #include "chrome/common/url_constants.h" | 68 #include "chrome/common/url_constants.h" |
69 #include "gfx/canvas_skia.h" | |
70 #include "grit/app_resources.h" | 69 #include "grit/app_resources.h" |
71 #include "grit/chromium_strings.h" | 70 #include "grit/chromium_strings.h" |
72 #include "grit/generated_resources.h" | 71 #include "grit/generated_resources.h" |
73 #include "grit/locale_settings.h" | 72 #include "grit/locale_settings.h" |
74 #include "grit/theme_resources.h" | 73 #include "grit/theme_resources.h" |
75 #include "grit/webkit_resources.h" | 74 #include "grit/webkit_resources.h" |
76 #include "ui/base/l10n/l10n_util.h" | 75 #include "ui/base/l10n/l10n_util.h" |
77 #include "ui/base/resource/resource_bundle.h" | 76 #include "ui/base/resource/resource_bundle.h" |
| 77 #include "ui/gfx/canvas_skia.h" |
78 #include "views/controls/single_split_view.h" | 78 #include "views/controls/single_split_view.h" |
79 #include "views/focus/external_focus_tracker.h" | 79 #include "views/focus/external_focus_tracker.h" |
80 #include "views/focus/view_storage.h" | 80 #include "views/focus/view_storage.h" |
81 #include "views/layout/grid_layout.h" | 81 #include "views/layout/grid_layout.h" |
82 #include "views/widget/root_view.h" | 82 #include "views/widget/root_view.h" |
83 #include "views/window/dialog_delegate.h" | 83 #include "views/window/dialog_delegate.h" |
84 #include "views/window/window.h" | 84 #include "views/window/window.h" |
85 | 85 |
86 #if defined(OS_WIN) | 86 #if defined(OS_WIN) |
87 #include "chrome/browser/aeropeek_manager.h" | 87 #include "chrome/browser/aeropeek_manager.h" |
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2552 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2552 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
2553 | 2553 |
2554 return view; | 2554 return view; |
2555 } | 2555 } |
2556 #endif | 2556 #endif |
2557 | 2557 |
2558 // static | 2558 // static |
2559 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2559 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2560 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2560 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2561 } | 2561 } |
OLD | NEW |