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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_model.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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/ui/content_settings/content_setting_image_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 result.push_back(new ContentSettingGeolocationImageModel()); 561 result.push_back(new ContentSettingGeolocationImageModel());
562 result.push_back( 562 result.push_back(
563 new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT)); 563 new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
564 result.push_back(new ContentSettingRPHImageModel()); 564 result.push_back(new ContentSettingRPHImageModel());
565 result.push_back(new ContentSettingMediaImageModel()); 565 result.push_back(new ContentSettingMediaImageModel());
566 result.push_back( 566 result.push_back(
567 new ContentSettingBlockedImageModel( 567 new ContentSettingBlockedImageModel(
568 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS)); 568 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS));
569 result.push_back(new ContentSettingMIDISysExImageModel()); 569 result.push_back(new ContentSettingMIDISysExImageModel());
570 570
571 return result.Pass(); 571 return result;
572 } 572 }
573 573
574 void ContentSettingImageModel::SetIconByResourceId(int id) { 574 void ContentSettingImageModel::SetIconByResourceId(int id) {
575 raster_icon_id_ = id; 575 raster_icon_id_ = id;
576 raster_icon_ = 576 raster_icon_ =
577 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id); 577 ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
578 } 578 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698