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 |
11 #include "app/l10n_util.h" | 11 #include "app/l10n_util.h" |
12 #include "app/resource_bundle.h" | |
13 #include "base/command_line.h" | 12 #include "base/command_line.h" |
14 #include "base/i18n/rtl.h" | 13 #include "base/i18n/rtl.h" |
15 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
16 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
17 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
18 #include "chrome/app/chrome_dll_resource.h" | 17 #include "chrome/app/chrome_dll_resource.h" |
19 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 18 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
20 #include "chrome/browser/autocomplete/autocomplete_popup_view.h" | 19 #include "chrome/browser/autocomplete/autocomplete_popup_view.h" |
21 #include "chrome/browser/automation/ui_controls.h" | 20 #include "chrome/browser/automation/ui_controls.h" |
22 #include "chrome/browser/bookmarks/bookmark_utils.h" | 21 #include "chrome/browser/bookmarks/bookmark_utils.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "chrome/common/notification_service.h" | 66 #include "chrome/common/notification_service.h" |
68 #include "chrome/common/pref_names.h" | 67 #include "chrome/common/pref_names.h" |
69 #include "chrome/common/url_constants.h" | 68 #include "chrome/common/url_constants.h" |
70 #include "gfx/canvas_skia.h" | 69 #include "gfx/canvas_skia.h" |
71 #include "grit/app_resources.h" | 70 #include "grit/app_resources.h" |
72 #include "grit/chromium_strings.h" | 71 #include "grit/chromium_strings.h" |
73 #include "grit/generated_resources.h" | 72 #include "grit/generated_resources.h" |
74 #include "grit/locale_settings.h" | 73 #include "grit/locale_settings.h" |
75 #include "grit/theme_resources.h" | 74 #include "grit/theme_resources.h" |
76 #include "grit/webkit_resources.h" | 75 #include "grit/webkit_resources.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/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" |
(...skipping 2466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2553 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2553 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
2554 | 2554 |
2555 return view; | 2555 return view; |
2556 } | 2556 } |
2557 #endif | 2557 #endif |
2558 | 2558 |
2559 // static | 2559 // static |
2560 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2560 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2561 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2561 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2562 } | 2562 } |
OLD | NEW |