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

Side by Side Diff: chrome/browser/chromeos/imageburner/burn_manager.cc

Issue 14021015: Move components/zip to third_party/zip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update unit_tests.isolate for new test data location Created 7 years, 7 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
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/component_updater/component_unpacker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/imageburner/burn_manager.h" 5 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/threading/worker_pool.h" 10 #include "base/threading/worker_pool.h"
11 #include "chrome/browser/chromeos/system/statistics_provider.h" 11 #include "chrome/browser/chromeos/system/statistics_provider.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/dbus/image_burner_client.h" 13 #include "chromeos/dbus/image_burner_client.h"
14 #include "chromeos/network/network_state.h" 14 #include "chromeos/network/network_state.h"
15 #include "chromeos/network/network_state_handler.h" 15 #include "chromeos/network/network_state_handler.h"
16 #include "components/zip/zip.h"
17 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "net/url_request/url_fetcher.h" 18 #include "net/url_request/url_fetcher.h"
20 #include "net/url_request/url_request_context_getter.h" 19 #include "net/url_request/url_request_context_getter.h"
21 #include "net/url_request/url_request_status.h" 20 #include "net/url_request/url_request_status.h"
21 #include "third_party/zlib/google/zip.h"
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
24 24
25 namespace chromeos { 25 namespace chromeos {
26 namespace imageburner { 26 namespace imageburner {
27 27
28 namespace { 28 namespace {
29 29
30 // Name for hwid in machine statistics. 30 // Name for hwid in machine statistics.
31 const char kHwidStatistic[] = "hardware_class"; 31 const char kHwidStatistic[] = "hardware_class";
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 // Note: in theory, this is not a part of notification, but cancelling 641 // Note: in theory, this is not a part of notification, but cancelling
642 // the running burning task. However, there is no good place to be in the 642 // the running burning task. However, there is no good place to be in the
643 // current code. 643 // current code.
644 // TODO(hidehiko): Clean this up after refactoring. 644 // TODO(hidehiko): Clean this up after refactoring.
645 OnError(IDS_IMAGEBURN_DEVICE_NOT_FOUND_ERROR); 645 OnError(IDS_IMAGEBURN_DEVICE_NOT_FOUND_ERROR);
646 } 646 }
647 } 647 }
648 648
649 } // namespace imageburner 649 } // namespace imageburner
650 } // namespace chromeos 650 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/component_updater/component_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698