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

Side by Side Diff: chrome/browser/debugger/devtools_window.cc

Issue 10832128: Convert FaviconStatus::bitmap from SkBitmap to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tests? Created 8 years, 4 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) 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE) { 192 action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE) {
193 frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost( 193 frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(
194 tab_contents->web_contents(), 194 tab_contents->web_contents(),
195 this); 195 this);
196 file_helper_.reset(new DevToolsFileHelper(profile, this)); 196 file_helper_.reset(new DevToolsFileHelper(profile, this));
197 197
198 g_instances.Get().push_back(this); 198 g_instances.Get().push_back(this);
199 // Wipe out page icon so that the default application icon is used. 199 // Wipe out page icon so that the default application icon is used.
200 NavigationEntry* entry = 200 NavigationEntry* entry =
201 tab_contents_->web_contents()->GetController().GetActiveEntry(); 201 tab_contents_->web_contents()->GetController().GetActiveEntry();
202 entry->GetFavicon().bitmap = SkBitmap(); 202 entry->GetFavicon().image = gfx::Image();
203 entry->GetFavicon().valid = true; 203 entry->GetFavicon().valid = true;
204 204
205 // Register on-load actions. 205 // Register on-load actions.
206 registrar_.Add( 206 registrar_.Add(
207 this, 207 this,
208 content::NOTIFICATION_LOAD_STOP, 208 content::NOTIFICATION_LOAD_STOP,
209 content::Source<NavigationController>( 209 content::Source<NavigationController>(
210 &tab_contents_->web_contents()->GetController())); 210 &tab_contents_->web_contents()->GetController()));
211 registrar_.Add( 211 registrar_.Add(
212 this, 212 this,
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 GetJavaScriptDialogCreator(); 764 GetJavaScriptDialogCreator();
765 } 765 }
766 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); 766 return content::WebContentsDelegate::GetJavaScriptDialogCreator();
767 } 767 }
768 768
769 void DevToolsWindow::RunFileChooser(WebContents* web_contents, 769 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
770 const FileChooserParams& params) { 770 const FileChooserParams& params) {
771 FileSelectHelper::RunFileChooser(web_contents, params); 771 FileSelectHelper::RunFileChooser(web_contents, params);
772 } 772 }
773 773
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_handler.cc » ('j') | content/public/browser/favicon_status.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698