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

Side by Side Diff: chrome/browser/ui/webui/flash_ui.cc

Issue 7825026: Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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/ui/webui/flash_ui.h" 5 #include "chrome/browser/ui/webui/flash_ui.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // GPU process has not run yet, this will trigger its launch. 126 // GPU process has not run yet, this will trigger its launch.
127 gpu_data_manager_->RequestCompleteGpuInfoIfNeeded(); 127 gpu_data_manager_->RequestCompleteGpuInfoIfNeeded();
128 128
129 // GPU access might not be allowed at all, which will cause us not to get a 129 // GPU access might not be allowed at all, which will cause us not to get a
130 // call back. 130 // call back.
131 if (!gpu_data_manager_->GpuAccessAllowed()) 131 if (!gpu_data_manager_->GpuAccessAllowed())
132 OnGpuInfoUpdate(); 132 OnGpuInfoUpdate();
133 133
134 // And lastly, we fire off a timer to make sure we never get stuck at the 134 // And lastly, we fire off a timer to make sure we never get stuck at the
135 // "Loading..." message. 135 // "Loading..." message.
136 timeout_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kTimeout), 136 timeout_.Start(base::TimeDelta::FromMilliseconds(kTimeout),
137 this, &FlashDOMHandler::OnTimeout); 137 this, &FlashDOMHandler::OnTimeout);
138 } 138 }
139 139
140 void FlashDOMHandler::RegisterMessages() { 140 void FlashDOMHandler::RegisterMessages() {
141 web_ui_->RegisterMessageCallback("requestFlashInfo", 141 web_ui_->RegisterMessageCallback("requestFlashInfo",
142 NewCallback(this, &FlashDOMHandler::HandleRequestFlashInfo)); 142 NewCallback(this, &FlashDOMHandler::HandleRequestFlashInfo));
143 } 143 }
144 144
145 void FlashDOMHandler::OnCrashListAvailable() { 145 void FlashDOMHandler::OnCrashListAvailable() {
146 crash_list_available_ = true; 146 crash_list_available_ = true;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 // Set up the about:flash source. 337 // Set up the about:flash source.
338 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); 338 Profile* profile = Profile::FromBrowserContext(contents->browser_context());
339 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); 339 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource());
340 } 340 }
341 341
342 // static 342 // static
343 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { 343 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
344 // Use the default icon for now. 344 // Use the default icon for now.
345 return NULL; 345 return NULL;
346 } 346 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698