diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-27 18:24:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-28 02:26:02 +0000 |
| commit | e486004502c17ab80953ef324926a536b8030d1e (patch) | |
| tree | 9f51129a18a65823dfa8242491756a0697ea274a /apps | |
| parent | 03b487d118b5b1c0e5651a889cc56b443ba1d526 (diff) | |
| download | chromium_src-e486004502c17ab80953ef324926a536b8030d1e.zip chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.gz chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.bz2 | |
Global conversion of Pass()→std::move() on OS==linux
❆(੭ु ◜◡‾)੭ु⁾☃❆
BUG=557422
R=avi@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1550693002
Cr-Commit-Position: refs/heads/master@{#366956}
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/custom_launcher_page_contents.cc | 4 | ||||
| -rw-r--r-- | apps/saved_files_service.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/custom_launcher_page_contents.cc b/apps/custom_launcher_page_contents.cc index 8888993..70c9b0f 100644 --- a/apps/custom_launcher_page_contents.cc +++ b/apps/custom_launcher_page_contents.cc @@ -5,6 +5,7 @@ #include "apps/custom_launcher_page_contents.h" #include <string> +#include <utility> #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" @@ -22,8 +23,7 @@ namespace apps { CustomLauncherPageContents::CustomLauncherPageContents( scoped_ptr<extensions::AppDelegate> app_delegate, const std::string& extension_id) - : app_delegate_(app_delegate.Pass()), extension_id_(extension_id) { -} + : app_delegate_(std::move(app_delegate)), extension_id_(extension_id) {} CustomLauncherPageContents::~CustomLauncherPageContents() { } diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index d166338..bfe40278 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -5,9 +5,9 @@ #include "apps/saved_files_service.h" #include <stdint.h> - #include <algorithm> #include <map> +#include <utility> #include "apps/saved_files_service_factory.h" #include "base/containers/scoped_ptr_hash_map.h" @@ -423,7 +423,7 @@ void SavedFilesService::SavedFiles::LoadSavedFileEntriesFromPreferences() { const std::string& id = file_entry->id; saved_file_lru_.insert( std::make_pair(file_entry->sequence_number, file_entry.get())); - registered_file_entries_.add(id, file_entry.Pass()); + registered_file_entries_.add(id, std::move(file_entry)); } } |