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

Side by Side Diff: chrome/browser/chromeos/extensions/echo_private_api.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/extensions/echo_private_api.h" 5 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/prefs/pref_registry_simple.h" 12 #include "base/prefs/pref_registry_simple.h"
13 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
14 #include "base/prefs/scoped_user_pref_update.h" 14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 20 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 void EchoPrivateGetUserConsentFunction::Finalize(bool consent) { 274 void EchoPrivateGetUserConsentFunction::Finalize(bool consent) {
275 // Consent should not be true if offers redeeming is disabled. 275 // Consent should not be true if offers redeeming is disabled.
276 CHECK(redeem_offers_allowed_ || !consent); 276 CHECK(redeem_offers_allowed_ || !consent);
277 results_ = echo_api::GetUserConsent::Results::Create(consent); 277 results_ = echo_api::GetUserConsent::Results::Create(consent);
278 SendResponse(true); 278 SendResponse(true);
279 279
280 // Release the reference added in |OnRedeemOffersAllowedChecked|, before 280 // Release the reference added in |OnRedeemOffersAllowedChecked|, before
281 // showing the dialog. 281 // showing the dialog.
282 Release(); 282 Release();
283 } 283 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698