Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 7745049: Reverts debugging code added for 91396. I've tracked down the bug and (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index e198f84547c275a066f191e7709c70c750e1ab7e..a471e6f06e4cdacd996f65c2b3f529b8bc624013 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -8,7 +8,6 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -33,16 +32,13 @@ namespace {
// been initialized.
// TODO(mirandac): This function will also separate windows by profile in a
// multi-profile environment.
-PrefService* GetPrefsForWindow(const views::Widget* window,
- bool* using_local_state) {
+PrefService* GetPrefsForWindow(const views::Widget* window) {
Profile* profile = reinterpret_cast<Profile*>(
window->GetNativeWindowProperty(Profile::kProfileKey));
if (!profile) {
// Use local state for windows that have no explicit profile.
- *using_local_state = true;
return g_browser_process->local_state();
}
- *using_local_state = false;
return profile->GetPrefs();
}
@@ -66,14 +62,11 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
const std::wstring& window_name,
const gfx::Rect& bounds,
bool maximized) {
- bool using_local_state = false;
- PrefService* prefs = GetPrefsForWindow(window, &using_local_state);
+ PrefService* prefs = GetPrefsForWindow(window);
if (!prefs)
return;
- CHECK(prefs->FindPreference(WideToUTF8(window_name).c_str())) << " " <<
- browser_shutdown::GetShutdownType() << " " << using_local_state << " " <<
- window->destroy_state();
+ DCHECK(prefs->FindPreference(WideToUTF8(window_name).c_str()));
DictionaryPrefUpdate update(prefs, WideToUTF8(window_name).c_str());
DictionaryValue* window_preferences = update.Get();
window_preferences->SetInteger("left", bounds.x());
« no previous file with comments | « no previous file | views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698