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

Side by Side Diff: content/browser/download/drag_download_file.cc

Issue 638503002: Replacing the OVERRIDE with override and FINAL with final in content/browser/[download|… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "content/browser/download/drag_download_file.h" 5 #include "content/browser/download/drag_download_file.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "content/browser/download/download_stats.h" 10 #include "content/browser/download/download_stats.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 DCHECK_NE(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason); 96 DCHECK_NE(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
97 on_completed_loop_->PostTask(FROM_HERE, base::Bind(on_completed_, false)); 97 on_completed_loop_->PostTask(FROM_HERE, base::Bind(on_completed_, false));
98 return; 98 return;
99 } 99 }
100 DCHECK_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason); 100 DCHECK_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
101 download_item_ = item; 101 download_item_ = item;
102 download_item_->AddObserver(this); 102 download_item_->AddObserver(this);
103 } 103 }
104 104
105 // DownloadItem::Observer: 105 // DownloadItem::Observer:
106 virtual void OnDownloadUpdated(DownloadItem* item) OVERRIDE { 106 virtual void OnDownloadUpdated(DownloadItem* item) override {
107 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 107 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
108 DCHECK_EQ(download_item_, item); 108 DCHECK_EQ(download_item_, item);
109 DownloadItem::DownloadState state = download_item_->GetState(); 109 DownloadItem::DownloadState state = download_item_->GetState();
110 if (state == DownloadItem::COMPLETE || 110 if (state == DownloadItem::COMPLETE ||
111 state == DownloadItem::CANCELLED || 111 state == DownloadItem::CANCELLED ||
112 state == DownloadItem::INTERRUPTED) { 112 state == DownloadItem::INTERRUPTED) {
113 if (!on_completed_.is_null()) { 113 if (!on_completed_.is_null()) {
114 on_completed_loop_->PostTask(FROM_HERE, base::Bind( 114 on_completed_loop_->PostTask(FROM_HERE, base::Bind(
115 on_completed_, state == DownloadItem::COMPLETE)); 115 on_completed_, state == DownloadItem::COMPLETE));
116 on_completed_.Reset(); 116 on_completed_.Reset();
117 } 117 }
118 download_item_->RemoveObserver(this); 118 download_item_->RemoveObserver(this);
119 download_item_ = NULL; 119 download_item_ = NULL;
120 } 120 }
121 // Ignore other states. 121 // Ignore other states.
122 } 122 }
123 123
124 virtual void OnDownloadDestroyed(DownloadItem* item) OVERRIDE { 124 virtual void OnDownloadDestroyed(DownloadItem* item) override {
125 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 125 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
126 DCHECK_EQ(download_item_, item); 126 DCHECK_EQ(download_item_, item);
127 if (!on_completed_.is_null()) { 127 if (!on_completed_.is_null()) {
128 const bool is_complete = 128 const bool is_complete =
129 download_item_->GetState() == DownloadItem::COMPLETE; 129 download_item_->GetState() == DownloadItem::COMPLETE;
130 on_completed_loop_->PostTask(FROM_HERE, base::Bind( 130 on_completed_loop_->PostTask(FROM_HERE, base::Bind(
131 on_completed_, is_complete)); 131 on_completed_, is_complete));
132 on_completed_.Reset(); 132 on_completed_.Reset();
133 } 133 }
134 download_item_->RemoveObserver(this); 134 download_item_->RemoveObserver(this);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 void DragDownloadFile::CheckThread() { 235 void DragDownloadFile::CheckThread() {
236 #if defined(OS_WIN) 236 #if defined(OS_WIN)
237 DCHECK(drag_message_loop_ == base::MessageLoop::current()); 237 DCHECK(drag_message_loop_ == base::MessageLoop::current());
238 #else 238 #else
239 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 239 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
240 #endif 240 #endif
241 } 241 }
242 242
243 } // namespace content 243 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/drag_download_file.h ('k') | content/browser/download/drag_download_file_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698