diff options
author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-08 17:20:11 +0000 |
---|---|---|
committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-08 17:20:11 +0000 |
commit | fb4cb3712b06f8ce480206fb437c70f649882788 (patch) | |
tree | 2bf33dfe3ff1232f5f443482b1bfe9a34a436ac1 | |
parent | 768d5f0b1c9601a2fdc1d17146fb450625a80e8c (diff) | |
download | chromium_src-fb4cb3712b06f8ce480206fb437c70f649882788.zip chromium_src-fb4cb3712b06f8ce480206fb437c70f649882788.tar.gz chromium_src-fb4cb3712b06f8ce480206fb437c70f649882788.tar.bz2 |
Fix LLVM errors/warning in Chrome OS code
BUG=none
TEST=build
Review URL: http://codereview.chromium.org/6932066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84578 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/chromeos/cros/libcros_service_library.cc | 10 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/mount_library.cc | 16 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/network_screen.h | 2 | ||||
-rw-r--r-- | printing/metafile.h | 2 |
5 files changed, 7 insertions, 25 deletions
diff --git a/chrome/browser/chromeos/cros/libcros_service_library.cc b/chrome/browser/chromeos/cros/libcros_service_library.cc index a8a3e61..b4f2b32 100644 --- a/chrome/browser/chromeos/cros/libcros_service_library.cc +++ b/chrome/browser/chromeos/cros/libcros_service_library.cc @@ -174,12 +174,10 @@ LibCrosServiceLibraryImpl::NetworkProxyLibrary::NetworkProxyLibrary( LibCrosServiceLibraryImpl::NetworkProxyLibrary::~NetworkProxyLibrary() { base::AutoLock lock(data_lock_); - if (!all_requests_.empty()) { - for (size_t i = all_requests_.size() - 1; i >= 0; --i) { - LOG(WARNING) << "Pending request for " << all_requests_[i]->source_url_; - delete all_requests_[i]; - } - all_requests_.clear(); + while (!all_requests_.empty()) { + LOG(WARNING) << "Pending request for " << all_requests_.back()->source_url_; + delete all_requests_.back(); + all_requests_.pop_back(); } } diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc index c0e48ff..c0529aa 100644 --- a/chrome/browser/chromeos/cros/mount_library.cc +++ b/chrome/browser/chromeos/cros/mount_library.cc @@ -78,21 +78,6 @@ class MountLibraryImpl : public MountLibrary { this); } - virtual void RefreshDiskProperties(const Disk* disk) OVERRIDE { - CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - DCHECK(disk); - if (!CrosLibrary::Get()->EnsureLoaded()) { - OnGetDiskProperties(disk->device_path().c_str(), - NULL, - MOUNT_METHOD_ERROR_LOCAL, - kLibraryNotLoaded); - return; - } - GetDiskProperties(disk->device_path().c_str(), - &MountLibraryImpl::GetDiskPropertiesCallback, - this); - } - const DiskMap& disks() const OVERRIDE { return disks_; } private: @@ -414,7 +399,6 @@ class MountLibraryStubImpl : public MountLibrary { virtual void RequestMountInfoRefresh() OVERRIDE {} virtual void MountPath(const char* device_path) OVERRIDE {} virtual void UnmountPath(const char* device_path) OVERRIDE {} - virtual bool IsBootPath(const char* device_path) OVERRIDE { return true; } private: // The list of disks found. diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 9019e46..47f96fc 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -751,7 +751,7 @@ static bool ParseFoundNetworksFromList(const ListValue* list, for (ListValue::const_iterator it = list->begin(); it != list->end(); ++it) { if ((*it)->IsType(Value::TYPE_DICTIONARY)) { found_networks_->resize(found_networks_->size() + 1); - DictionaryValue* dict = static_cast<const DictionaryValue*>(*it); + const DictionaryValue* dict = static_cast<const DictionaryValue*>(*it); dict->GetStringWithoutPathExpansion( kStatusProperty, &found_networks_->back().status); dict->GetStringWithoutPathExpansion( diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h index 23ae1f1..e047878 100644 --- a/chrome/browser/chromeos/login/network_screen.h +++ b/chrome/browser/chromeos/login/network_screen.h @@ -15,6 +15,7 @@ #include "chrome/browser/chromeos/login/language_switch_menu.h" #include "chrome/browser/chromeos/login/message_bubble.h" #include "chrome/browser/chromeos/login/network_screen_delegate.h" +#include "chrome/browser/chromeos/login/network_selection_view.h" #include "chrome/browser/chromeos/login/view_screen.h" #include "chrome/browser/chromeos/options/network_config_view.h" @@ -23,7 +24,6 @@ class WizardScreenDelegate; namespace chromeos { class HelpAppLauncher; -class NetworkSelectionView; class NetworkScreen : public ViewScreen<NetworkSelectionView>, public MessageBubbleDelegate, diff --git a/printing/metafile.h b/printing/metafile.h index 1142a39..c155fbc 100644 --- a/printing/metafile.h +++ b/printing/metafile.h @@ -31,7 +31,7 @@ class PlatformDevice; #if defined(OS_CHROMEOS) namespace base { -class FileDescriptor; +struct FileDescriptor; } #endif |