Index: chrome/browser/ui/gtk/browser_window_gtk.cc |
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc |
index 4e46d41d0d670b8c6781d37395bd206d1280ffbe..b7b7b158bcc4cfb10054be829d8eff444c84cc2c 100644 |
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc |
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc |
@@ -41,8 +41,8 @@ |
#include "chrome/browser/ui/find_bar/find_tab_helper.h" |
#include "chrome/browser/ui/gtk/about_chrome_dialog.h" |
#include "chrome/browser/ui/gtk/accelerators_gtk.h" |
-#include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" |
#include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h" |
+#include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" |
#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" |
#include "chrome/browser/ui/gtk/browser_titlebar.h" |
#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" |
@@ -68,12 +68,12 @@ |
#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
#include "chrome/browser/ui/gtk/task_manager_gtk.h" |
#include "chrome/browser/ui/gtk/update_recommended_dialog.h" |
+#include "chrome/browser/ui/monitor_info_provider.h" |
#include "chrome/browser/ui/omnibox/location_bar.h" |
#include "chrome/browser/ui/omnibox/omnibox_view.h" |
#include "chrome/browser/ui/page_info_bubble.h" |
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
#include "chrome/browser/ui/webui/task_manager_dialog.h" |
-#include "chrome/browser/ui/window_sizer.h" |
#include "chrome/browser/web_applications/web_app.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/chrome_switches.h" |
@@ -83,8 +83,8 @@ |
#include "content/browser/renderer_host/render_widget_host_view.h" |
#include "content/browser/tab_contents/tab_contents.h" |
#include "content/browser/tab_contents/tab_contents_view.h" |
-#include "content/public/browser/notification_service.h" |
#include "content/public/browser/native_web_keyboard_event.h" |
+#include "content/public/browser/notification_service.h" |
#include "grit/chromium_strings.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
@@ -1956,10 +1956,9 @@ void BrowserWindowGtk::SaveWindowPosition() { |
window_preferences->SetInteger("bottom", restored_bounds_.bottom()); |
window_preferences->SetBoolean("maximized", IsMaximized()); |
- scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_info_provider( |
- WindowSizer::CreateDefaultMonitorInfoProvider()); |
+ scoped_ptr<MonitorInfoProvider> monitor_info(MonitorInfoProvider::Create()); |
gfx::Rect work_area( |
- monitor_info_provider->GetMonitorWorkAreaMatching(restored_bounds_)); |
+ monitor_info->GetMonitorWorkAreaMatching(restored_bounds_)); |
window_preferences->SetInteger("work_area_left", work_area.x()); |
window_preferences->SetInteger("work_area_top", work_area.y()); |
window_preferences->SetInteger("work_area_right", work_area.right()); |