| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "base/path_service.h" | 23 #include "base/path_service.h" |
| 24 #include "base/prefs/pref_service.h" | 24 #include "base/prefs/pref_service.h" |
| 25 #include "base/string_util.h" | 25 #include "base/string_util.h" |
| 26 #include "base/time.h" | 26 #include "base/time.h" |
| 27 #include "base/utf_string_conversions.h" | 27 #include "base/utf_string_conversions.h" |
| 28 #include "chrome/app/chrome_command_ids.h" | 28 #include "chrome/app/chrome_command_ids.h" |
| 29 #include "chrome/browser/api/infobars/infobar_service.h" | 29 #include "chrome/browser/api/infobars/infobar_service.h" |
| 30 #include "chrome/browser/browser_process.h" | 30 #include "chrome/browser/browser_process.h" |
| 31 #include "chrome/browser/download/download_item_model.h" | 31 #include "chrome/browser/download/download_item_model.h" |
| 32 #include "chrome/browser/extensions/tab_helper.h" | 32 #include "chrome/browser/extensions/tab_helper.h" |
| 33 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
| 34 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 33 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 35 #include "chrome/browser/profiles/profile.h" | 34 #include "chrome/browser/profiles/profile.h" |
| 36 #include "chrome/browser/themes/theme_properties.h" | 35 #include "chrome/browser/themes/theme_properties.h" |
| 37 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" | 36 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" |
| 38 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 37 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
| 39 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 38 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 40 #include "chrome/browser/ui/browser.h" | 39 #include "chrome/browser/ui/browser.h" |
| 41 #include "chrome/browser/ui/browser_command_controller.h" | 40 #include "chrome/browser/ui/browser_command_controller.h" |
| 42 #include "chrome/browser/ui/browser_commands.h" | 41 #include "chrome/browser/ui/browser_commands.h" |
| 43 #include "chrome/browser/ui/browser_dialogs.h" | 42 #include "chrome/browser/ui/browser_dialogs.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include "chrome/browser/ui/gtk/task_manager_gtk.h" | 75 #include "chrome/browser/ui/gtk/task_manager_gtk.h" |
| 77 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" | 76 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" |
| 78 #include "chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.h" | 77 #include "chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.h" |
| 79 #include "chrome/browser/ui/omnibox/location_bar.h" | 78 #include "chrome/browser/ui/omnibox/location_bar.h" |
| 80 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 79 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| 81 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 80 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 82 #include "chrome/browser/web_applications/web_app.h" | 81 #include "chrome/browser/web_applications/web_app.h" |
| 83 #include "chrome/common/chrome_notification_types.h" | 82 #include "chrome/common/chrome_notification_types.h" |
| 84 #include "chrome/common/chrome_switches.h" | 83 #include "chrome/common/chrome_switches.h" |
| 85 #include "chrome/common/pref_names.h" | 84 #include "chrome/common/pref_names.h" |
| 85 #include "components/user_prefs/pref_registry_syncable.h" |
| 86 #include "content/public/browser/download_manager.h" | 86 #include "content/public/browser/download_manager.h" |
| 87 #include "content/public/browser/native_web_keyboard_event.h" | 87 #include "content/public/browser/native_web_keyboard_event.h" |
| 88 #include "content/public/browser/notification_service.h" | 88 #include "content/public/browser/notification_service.h" |
| 89 #include "content/public/browser/render_view_host.h" | 89 #include "content/public/browser/render_view_host.h" |
| 90 #include "content/public/browser/render_widget_host_view.h" | 90 #include "content/public/browser/render_widget_host_view.h" |
| 91 #include "content/public/browser/web_contents.h" | 91 #include "content/public/browser/web_contents.h" |
| 92 #include "content/public/browser/web_contents_view.h" | 92 #include "content/public/browser/web_contents_view.h" |
| 93 #include "grit/chromium_strings.h" | 93 #include "grit/chromium_strings.h" |
| 94 #include "grit/generated_resources.h" | 94 #include "grit/generated_resources.h" |
| 95 #include "grit/theme_resources.h" | 95 #include "grit/theme_resources.h" |
| (...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2406 wm_type == ui::WM_OPENBOX || | 2406 wm_type == ui::WM_OPENBOX || |
| 2407 wm_type == ui::WM_XFWM4); | 2407 wm_type == ui::WM_XFWM4); |
| 2408 } | 2408 } |
| 2409 | 2409 |
| 2410 // static | 2410 // static |
| 2411 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2411 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2412 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2412 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2413 browser_window_gtk->Init(); | 2413 browser_window_gtk->Init(); |
| 2414 return browser_window_gtk; | 2414 return browser_window_gtk; |
| 2415 } | 2415 } |
| OLD | NEW |