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

Side by Side Diff: chrome/browser/chromeos/mobile_config.cc

Issue 9034032: And now NewRunnableMethod(), you die. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_frame_automation Created 8 years, 11 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/chromeos/mobile_config.h" 5 #include "chrome/browser/chromeos/mobile_config.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // Location of the global carrier config. 49 // Location of the global carrier config.
50 const char kGlobalCarrierConfigPath[] = 50 const char kGlobalCarrierConfigPath[] =
51 "/usr/share/chromeos-assets/mobile/carrier_config.json"; 51 "/usr/share/chromeos-assets/mobile/carrier_config.json";
52 52
53 // Location of the local carrier config. 53 // Location of the local carrier config.
54 const char kLocalCarrierConfigPath[] = 54 const char kLocalCarrierConfigPath[] =
55 "/opt/oem/etc/carrier_config.json"; 55 "/opt/oem/etc/carrier_config.json";
56 56
57 } // anonymous namespace 57 } // anonymous namespace
58 58
59 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::MobileConfig);
60
61 namespace chromeos { 59 namespace chromeos {
62 60
63 // MobileConfig::CarrierDeal implementation. ----------------------------------- 61 // MobileConfig::CarrierDeal implementation. -----------------------------------
64 62
65 MobileConfig::CarrierDeal::CarrierDeal(DictionaryValue* deal_dict) 63 MobileConfig::CarrierDeal::CarrierDeal(DictionaryValue* deal_dict)
66 : notification_count_(0), 64 : notification_count_(0),
67 localized_strings_(NULL) { 65 localized_strings_(NULL) {
68 deal_dict->GetString(kDealIdAttr, &deal_id_); 66 deal_dict->GetString(kDealIdAttr, &deal_id_);
69 67
70 // Extract list of deal locales. 68 // Extract list of deal locales.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 << local_config_file.value(); 331 << local_config_file.value();
334 } 332 }
335 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 333 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
336 base::Bind(&MobileConfig::ProcessConfig, 334 base::Bind(&MobileConfig::ProcessConfig,
337 base::Unretained(this), // singleton. 335 base::Unretained(this), // singleton.
338 global_config, 336 global_config,
339 local_config)); 337 local_config));
340 } 338 }
341 339
342 } // namespace chromeos 340 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/media/media_player.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698