summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_prefs.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 22:10:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 22:10:53 +0000
commitfcdc18a51a39aa9f9a8961306eb583d17ee26289 (patch)
tree8cc16230516561665acb685acf1dda408a29fdc2 /chrome/browser/browser_prefs.cc
parent5d722824a29973ca54ae6e1bb4ee36a88e6854d5 (diff)
downloadchromium_src-fcdc18a51a39aa9f9a8961306eb583d17ee26289.zip
chromium_src-fcdc18a51a39aa9f9a8961306eb583d17ee26289.tar.gz
chromium_src-fcdc18a51a39aa9f9a8961306eb583d17ee26289.tar.bz2
Mac: Save/restore task manager window pos and size.
Make window size remembering mechanism easier to use and more compatible with windows's chrome profiles. Nib changes: Unset "show at startup" so that the initial repositioning isn't visible. BUG=32147 TEST=Move & size taskman window, quit chrome, reopen chrome. Size & pos should've stayed. Same for keyword editor. Page info dialog should behave as it did before. Review URL: http://codereview.chromium.org/536086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
-rw-r--r--chrome/browser/browser_prefs.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index ced36f5..b9e7fa2 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -31,19 +31,12 @@
#include "chrome/browser/session_startup_pref.h"
#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/task_manager.h"
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
#include "chrome/browser/views/frame/browser_view.h"
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
-#include "chrome/browser/task_manager.h"
-#endif
-
-#if defined(OS_WIN)
-#include "chrome/browser/views/keyword_editor_view.h"
-#endif
-
#if defined(TOOLKIT_GTK)
#include "chrome/browser/gtk/browser_window_gtk.h"
#endif
@@ -77,9 +70,7 @@ void RegisterLocalState(PrefService* local_state) {
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
BrowserView::RegisterBrowserViewPrefs(local_state);
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
TaskManager::RegisterPrefs(local_state);
-#endif
}
void RegisterUserPrefs(PrefService* user_prefs) {