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

Side by Side Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 7619006: base: Remove using declaration of FundamentalValue as it's no longer necessary. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/webui/options/clear_browser_data_handler.h" 5 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (*clear_plugin_lso_data_enabled_) 105 if (*clear_plugin_lso_data_enabled_)
106 remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA; 106 remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
107 } 107 }
108 if (prefs->GetBoolean(prefs::kDeletePasswords)) 108 if (prefs->GetBoolean(prefs::kDeletePasswords))
109 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; 109 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
110 if (prefs->GetBoolean(prefs::kDeleteFormData)) 110 if (prefs->GetBoolean(prefs::kDeleteFormData))
111 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; 111 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
112 112
113 int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod); 113 int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
114 114
115 FundamentalValue state(true); 115 base::FundamentalValue state(true);
116 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.setClearingState", 116 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.setClearingState",
117 state); 117 state);
118 118
119 // If we are still observing a previous data remover, we need to stop 119 // If we are still observing a previous data remover, we need to stop
120 // observing. 120 // observing.
121 if (remover_) 121 if (remover_)
122 remover_->RemoveObserver(this); 122 remover_->RemoveObserver(this);
123 123
124 // BrowsingDataRemover deletes itself when done. 124 // BrowsingDataRemover deletes itself when done.
125 remover_ = new BrowsingDataRemover(profile, 125 remover_ = new BrowsingDataRemover(profile,
126 static_cast<BrowsingDataRemover::TimePeriod>(period_selected), 126 static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
127 base::Time()); 127 base::Time());
128 remover_->AddObserver(this); 128 remover_->AddObserver(this);
129 remover_->Remove(remove_mask); 129 remover_->Remove(remove_mask);
130 } 130 }
131 131
132 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() { 132 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
133 // No need to remove ourselves as an observer as BrowsingDataRemover deletes 133 // No need to remove ourselves as an observer as BrowsingDataRemover deletes
134 // itself after we return. 134 // itself after we return.
135 remover_ = NULL; 135 remover_ = NULL;
136 DCHECK(web_ui_); 136 DCHECK(web_ui_);
137 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing"); 137 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
138 } 138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698