diff options
Diffstat (limited to 'chrome/browser/ui')
47 files changed, 123 insertions, 85 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index f63f659..a1a0985 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -194,7 +194,7 @@ class FakeTheme : public ui::ThemeProvider { virtual bool GetDisplayProperty(int id, int* result) const { return false; } virtual bool ShouldUseNativeFrame() const { return false; } virtual bool HasCustomImage(int id) const { return false; } - virtual RefCountedMemory* GetRawData(int id) const { return NULL; } + virtual base::RefCountedMemory* GetRawData(int id) const { return NULL; } virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { return nil; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm index ba1cc8b..6b4654f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm @@ -33,7 +33,7 @@ class MockThemeProvider : public ui::ThemeProvider { MOCK_CONST_METHOD2(GetDisplayProperty, bool(int, int*)); MOCK_CONST_METHOD0(ShouldUseNativeFrame, bool()); MOCK_CONST_METHOD1(HasCustomImage, bool(int)); - MOCK_CONST_METHOD1(GetRawData, RefCountedMemory*(int)); + MOCK_CONST_METHOD1(GetRawData, base::RefCountedMemory*(int)); // OSX stuff MOCK_CONST_METHOD2(GetNSImageNamed, NSImage*(int, bool)); diff --git a/chrome/browser/ui/cocoa/download/background_theme.h b/chrome/browser/ui/cocoa/download/background_theme.h index bb21de2..e9d4bd7 100644 --- a/chrome/browser/ui/cocoa/download/background_theme.h +++ b/chrome/browser/ui/cocoa/download/background_theme.h @@ -22,7 +22,7 @@ class BackgroundTheme : public ui::ThemeProvider { virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; virtual bool ShouldUseNativeFrame() const OVERRIDE; virtual bool HasCustomImage(int id) const OVERRIDE; - virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; + virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE; virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const OVERRIDE; diff --git a/chrome/browser/ui/cocoa/download/background_theme.mm b/chrome/browser/ui/cocoa/download/background_theme.mm index 1becbab..af4dc7c 100644 --- a/chrome/browser/ui/cocoa/download/background_theme.mm +++ b/chrome/browser/ui/cocoa/download/background_theme.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -47,7 +47,7 @@ bool BackgroundTheme::HasCustomImage(int id) const { return false; } -RefCountedMemory* BackgroundTheme::GetRawData(int id) const { +base::RefCountedMemory* BackgroundTheme::GetRawData(int id) const { return NULL; } diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc index 84e01b5..8154368 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks_ui.cc @@ -68,7 +68,7 @@ BookmarksUI::BookmarksUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() { +base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON); } diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h index 146033b..62b64b7 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.h +++ b/chrome/browser/ui/webui/bookmarks_ui.h @@ -11,7 +11,9 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "content/public/browser/web_ui_controller.h" +namespace base { class RefCountedMemory; +} // This class provides the source for chrome://bookmarks/ class BookmarksUIHTMLSource : public ChromeURLDataManager::DataSource { @@ -37,7 +39,7 @@ class BookmarksUI : public content::WebUIController { public: explicit BookmarksUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(BookmarksUI); diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index 0d19d3a..2d36e45 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -130,10 +130,11 @@ ChromeURLDataManager::DataSource::DataSource(const std::string& source_name, ChromeURLDataManager::DataSource::~DataSource() { } -void ChromeURLDataManager::DataSource::SendResponse(int request_id, - RefCountedMemory* bytes) { +void ChromeURLDataManager::DataSource::SendResponse( + int request_id, + base::RefCountedMemory* bytes) { // Take a ref-pointer on entry so byte->Release() will always get called. - scoped_refptr<RefCountedMemory> bytes_ptr(bytes); + scoped_refptr<base::RefCountedMemory> bytes_ptr(bytes); if (IsScheduledForDeletion(this)) { // We're scheduled for deletion. Servicing the request would result in // this->AddRef being invoked, even though the ref count is 0 and 'this' is @@ -194,7 +195,7 @@ void ChromeURLDataManager::DataSource::SetFontAndTextDirection( void ChromeURLDataManager::DataSource::SendResponseOnIOThread( int request_id, - scoped_refptr<RefCountedMemory> bytes) { + scoped_refptr<base::RefCountedMemory> bytes) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (backend_) backend_->DataAvailable(request_id, bytes); diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h index 7c3b4cc..98671be 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager.h @@ -18,10 +18,10 @@ class ChromeURLDataManagerBackend; class MessageLoop; class Profile; -class RefCountedMemory; namespace base { class DictionaryValue; +class RefCountedMemory; } // To serve dynamic data off of chrome: URLs, implement the @@ -82,7 +82,7 @@ class ChromeURLDataManager : public ProfileKeyedService { // Report that a request has resulted in the data |bytes|. // If the request can't be satisfied, pass NULL for |bytes| to indicate // the request is over. - virtual void SendResponse(int request_id, RefCountedMemory* bytes); + virtual void SendResponse(int request_id, base::RefCountedMemory* bytes); // Returns the MessageLoop on which the DataSource wishes to have // StartDataRequest called to handle the request for |path|. If the @@ -120,8 +120,9 @@ class ChromeURLDataManager : public ProfileKeyedService { // SendResponse invokes this on the IO thread. Notifies the backend to // handle the actual work of sending the data. - virtual void SendResponseOnIOThread(int request_id, - scoped_refptr<RefCountedMemory> bytes); + virtual void SendResponseOnIOThread( + int request_id, + scoped_refptr<base::RefCountedMemory> bytes); // The name of this source. // E.g., for favicons, this could be "favicon", which results in paths for diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index 2abda1b..838f541 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -175,7 +175,7 @@ class URLRequestChromeJob : public net::URLRequestJob { // Called by ChromeURLDataManager to notify us that the data blob is ready // for us. - void DataAvailable(RefCountedMemory* bytes); + void DataAvailable(base::RefCountedMemory* bytes); void SetMimeType(const std::string& mime_type) { mime_type_ = mime_type; @@ -193,7 +193,7 @@ class URLRequestChromeJob : public net::URLRequestJob { void CompleteRead(net::IOBuffer* buf, int buf_size, int* bytes_read); // The actual data we're serving. NULL until it's been fetched. - scoped_refptr<RefCountedMemory> data_; + scoped_refptr<base::RefCountedMemory> data_; // The current offset into the data that we're handing off to our // callers via the Read interfaces. int data_offset_; @@ -256,7 +256,7 @@ void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) { AddContentSecurityPolicyHeader(request_->url(), info->headers); } -void URLRequestChromeJob::DataAvailable(RefCountedMemory* bytes) { +void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) { TRACE_EVENT_ASYNC_END0("browser", "DataManager:Request", this); if (bytes) { // The request completed, and we have all the data. @@ -454,7 +454,7 @@ void ChromeURLDataManagerBackend::RemoveRequest(URLRequestChromeJob* job) { } void ChromeURLDataManagerBackend::DataAvailable(RequestID request_id, - RefCountedMemory* bytes) { + base::RefCountedMemory* bytes) { // Forward this data on to the pending net::URLRequest, if it exists. PendingRequestMap::iterator i = pending_requests_.find(request_id); if (i != pending_requests_.end()) { diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.h b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h index 5fa7772..74e7df2 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,9 +17,12 @@ class ChromeURLDataManagerBackend; class GURL; -class RefCountedMemory; class URLRequestChromeJob; +namespace base { +class RefCountedMemory; +} + namespace net { class URLRequest; class URLRequestJob; @@ -44,7 +47,7 @@ class ChromeURLDataManagerBackend { void AddDataSource(ChromeURLDataManager::DataSource* source); // DataSource invokes this. Sends the data to the URLRequest. - void DataAvailable(RequestID request_id, RefCountedMemory* bytes); + void DataAvailable(RequestID request_id, base::RefCountedMemory* bytes); static net::URLRequestJob* Factory(net::URLRequest* request, const std::string& scheme); diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 23e432a..3cd6c72 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -438,7 +438,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( ExtensionWebUI::GetFaviconForURL(profile, request, url); } else { history::FaviconData favicon; - favicon.image_data = scoped_refptr<RefCountedMemory>( + favicon.image_data = scoped_refptr<base::RefCountedMemory>( GetFaviconResourceBytes(url)); favicon.known_icon = favicon.image_data.get() != NULL && favicon.image_data->size() > 0; @@ -459,7 +459,7 @@ ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() { ChromeWebUIControllerFactory::~ChromeWebUIControllerFactory() { } -RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( +base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( const GURL& page_url) const { // The bookmark manager is a chrome extension, so we have to check for it // before we check for extension scheme. diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h index 1632bef..7ebc813 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h @@ -13,7 +13,10 @@ #include "chrome/browser/favicon/favicon_service.h" class Profile; + +namespace base { class RefCountedMemory; +} class ChromeWebUIControllerFactory : public content::WebUIControllerFactory { public: @@ -49,7 +52,7 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory { // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI // does not have a favicon. - RefCountedMemory* GetFaviconResourceBytes(const GURL& page_url) const; + base::RefCountedMemory* GetFaviconResourceBytes(const GURL& page_url) const; DISALLOW_COPY_AND_ASSIGN(ChromeWebUIControllerFactory); }; diff --git a/chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc b/chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc index a5e4e32..4ec91f3 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc @@ -29,13 +29,13 @@ class MockChromeWebUIDataSource : public ChromeWebUIDataSource { } // Store response for later comparisons. - virtual void SendResponse(int request_id, RefCountedMemory* data) { + virtual void SendResponse(int request_id, base::RefCountedMemory* data) { result_request_id_ = request_id; result_data_ = data; } int result_request_id_; - scoped_refptr<RefCountedMemory> result_data_; + scoped_refptr<base::RefCountedMemory> result_data_; private: virtual ~MockChromeWebUIDataSource() {} diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index a5bbd82..394a928 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -165,7 +165,7 @@ void RegisterPageUIHTMLSource::StartDataRequest(const std::string& path, return; } - scoped_refptr<RefCountedMemory> html_bytes( + scoped_refptr<base::RefCountedMemory> html_bytes( ResourceBundle::GetSharedInstance().LoadDataResourceBytes( IDR_HOST_REGISTRATION_PAGE_HTML)); diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index 984c326..75c1816 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -171,9 +171,10 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { - return static_cast<RefCountedMemory*>(ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_CONFLICT_FAVICON)); +base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { + return static_cast<base::RefCountedMemory*>( + ResourceBundle::GetSharedInstance().LoadDataResourceBytes( + IDR_CONFLICT_FAVICON)); } #endif diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index 8a402ae..0b243ac 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,14 +10,16 @@ #if defined(OS_WIN) +namespace base { class RefCountedMemory; +} // The Web UI handler for about:conflicts. class ConflictsUI : public content::WebUIController { public: explicit ConflictsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(ConflictsUI); diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index e1cda04..1c3c6c5 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -169,7 +169,7 @@ CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* CrashesUI::GetFaviconResourceBytes() { +base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_SAD_FAVICON); } diff --git a/chrome/browser/ui/webui/crashes_ui.h b/chrome/browser/ui/webui/crashes_ui.h index 9eeb940..db6ce4f 100644 --- a/chrome/browser/ui/webui/crashes_ui.h +++ b/chrome/browser/ui/webui/crashes_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,13 +8,15 @@ #include "content/public/browser/web_ui_controller.h" +namespace base { class RefCountedMemory; +} class CrashesUI : public content::WebUIController { public: explicit CrashesUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); // Whether crash reporting has been enabled. static bool CrashReportingEnabled(); diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc index cefaefc..efc035b 100644 --- a/chrome/browser/ui/webui/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads_ui.cc @@ -101,7 +101,7 @@ DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON); } diff --git a/chrome/browser/ui/webui/downloads_ui.h b/chrome/browser/ui/webui/downloads_ui.h index 9e10f02..21d8dfe 100644 --- a/chrome/browser/ui/webui/downloads_ui.h +++ b/chrome/browser/ui/webui/downloads_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,13 +8,15 @@ #include "content/public/browser/web_ui_controller.h" +namespace base { class RefCountedMemory; +} class DownloadsUI : public content::WebUIController { public: explicit DownloadsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(DownloadsUI); diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 0dfb7e3..a8bbec6 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -31,7 +31,7 @@ namespace { -scoped_refptr<RefCountedMemory> BitmapToMemory(const SkBitmap* image) { +scoped_refptr<base::RefCountedMemory> BitmapToMemory(const SkBitmap* image) { base::RefCountedBytes* image_bytes = new base::RefCountedBytes; gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_bytes->data()); return image_bytes; diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index f63e68a..4a1b3c0 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -143,7 +143,7 @@ void FaviconSource::OnFaviconDataAvailable( } void FaviconSource::SendDefaultResponse(int request_id) { - RefCountedMemory* bytes = NULL; + base::RefCountedMemory* bytes = NULL; if (request_size_map_[request_id] == 32) { if (!default_favicon_large_.get()) { default_favicon_large_ = diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 3e0f2ec..7b982f3 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -70,9 +70,9 @@ class FaviconSource : public ChromeURLDataManager::DataSource { // Raw PNG representation of the favicon to show when the favicon // database doesn't have a favicon for a webpage. // 16x16 - scoped_refptr<RefCountedMemory> default_favicon_; + scoped_refptr<base::RefCountedMemory> default_favicon_; // 32x32 - scoped_refptr<RefCountedMemory> default_favicon_large_; + scoped_refptr<base::RefCountedMemory> default_favicon_large_; // The history::IconTypes of icon that this FaviconSource handles. int icon_types_; diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 3115800..2e7da67 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -167,7 +167,7 @@ FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_FLAGS); } diff --git a/chrome/browser/ui/webui/flags_ui.h b/chrome/browser/ui/webui/flags_ui.h index a74044d..e5eaa03 100644 --- a/chrome/browser/ui/webui/flags_ui.h +++ b/chrome/browser/ui/webui/flags_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,13 +9,16 @@ #include "content/public/browser/web_ui_controller.h" class PrefService; + +namespace base { class RefCountedMemory; +} class FlagsUI : public content::WebUIController { public: explicit FlagsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); static void RegisterPrefs(PrefService* prefs); private: diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 1b219de..aa8d49e 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -380,7 +380,7 @@ FlashUI::FlashUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* FlashUI::GetFaviconResourceBytes() { +base::RefCountedMemory* FlashUI::GetFaviconResourceBytes() { // Use the default icon for now. return NULL; } diff --git a/chrome/browser/ui/webui/flash_ui.h b/chrome/browser/ui/webui/flash_ui.h index 47126ef..410c5c8 100644 --- a/chrome/browser/ui/webui/flash_ui.h +++ b/chrome/browser/ui/webui/flash_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,14 +8,16 @@ #include "content/public/browser/web_ui_controller.h" +namespace base { class RefCountedMemory; +} // The Web UI handler for about:flash. class FlashUI : public content::WebUIController { public: explicit FlashUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(FlashUI); diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 073c2f1..5c6adce 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -483,7 +483,7 @@ const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { } // static -RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { +base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_HISTORY_FAVICON); } diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 3690633..5e1911b 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -86,7 +86,7 @@ class HistoryUI : public content::WebUIController { // Return the URL for a given search term. static const GURL GetHistoryURLWithSearchText(const string16& text); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(HistoryUI); diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 8235b7d..7286db9 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -33,7 +33,7 @@ StringValue* SkColorToCss(SkColor color) { } base::StringValue* GetDominantColorCssString( - scoped_refptr<RefCountedMemory> png) { + scoped_refptr<base::RefCountedMemory> png) { color_utils::GridSampler sampler; SkColor color = color_utils::CalculateKMeanColorOfPNG(png, 100, 665, sampler); return SkColorToCss(color); diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index aea2a4f..211ccd1 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -55,7 +55,7 @@ class FaviconWebUIHandler : public content::WebUIMessageHandler { // Raw PNG representation of the favicon to show when the favicon // database doesn't have a favicon for a webpage. - scoped_refptr<RefCountedMemory> default_favicon_; + scoped_refptr<base::RefCountedMemory> default_favicon_; // Manage retrieval of icons from apps. scoped_ptr<ExtensionIconColorManager> app_icon_color_manager_; diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 23bd633..eab4387 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -409,7 +409,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path, return; } - scoped_refptr<RefCountedMemory> html_bytes( + scoped_refptr<base::RefCountedMemory> html_bytes( NTPResourceCacheFactory::GetForProfile(profile_)-> GetNewTabHTML(is_incognito)); diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index c317b7d..3a19642 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -212,7 +212,7 @@ bool NTPResourceCache::NewTabCacheNeedsRefresh() { return false; } -RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { +base::RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (is_incognito) { if (!new_tab_incognito_html_.get()) @@ -228,7 +228,7 @@ RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { new_tab_html_.get(); } -RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) { +base::RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (is_incognito) { if (!new_tab_incognito_css_.get()) diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index 6fd3c8b..bb9baf9 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h @@ -16,7 +16,10 @@ #include "content/public/browser/notification_registrar.h" class Profile; + +namespace base { class RefCountedMemory; +} // This class keeps a cache of NTP resources (HTML and CSS) so we don't have to // regenerate them all the time. @@ -26,8 +29,8 @@ class NTPResourceCache : public content::NotificationObserver, explicit NTPResourceCache(Profile* profile); virtual ~NTPResourceCache(); - RefCountedMemory* GetNewTabHTML(bool is_incognito); - RefCountedMemory* GetNewTabCSS(bool is_incognito); + base::RefCountedMemory* GetNewTabHTML(bool is_incognito); + base::RefCountedMemory* GetNewTabCSS(bool is_incognito); // content::NotificationObserver interface. virtual void Observe(int type, @@ -38,7 +41,7 @@ class NTPResourceCache : public content::NotificationObserver, Profile* profile_; void CreateNewTabHTML(); - scoped_refptr<RefCountedMemory> new_tab_html_; + scoped_refptr<base::RefCountedMemory> new_tab_html_; // Helper to determine if the resource cache should be invalidated. // This is called on every page load, and can be used to check values that @@ -51,12 +54,12 @@ class NTPResourceCache : public content::NotificationObserver, string16 GetSyncTypeMessage(); void CreateNewTabIncognitoHTML(); - scoped_refptr<RefCountedMemory> new_tab_incognito_html_; + scoped_refptr<base::RefCountedMemory> new_tab_incognito_html_; void CreateNewTabIncognitoCSS(); - scoped_refptr<RefCountedMemory> new_tab_incognito_css_; + scoped_refptr<base::RefCountedMemory> new_tab_incognito_css_; void CreateNewTabCSS(); - scoped_refptr<RefCountedMemory> new_tab_css_; + scoped_refptr<base::RefCountedMemory> new_tab_css_; content::NotificationRegistrar registrar_; PrefChangeRegistrar pref_change_registrar_; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc index 09e925d..db8d468 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc @@ -34,7 +34,7 @@ NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {} NTPResourceCache::~NTPResourceCache() {} -RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { +base::RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Android uses same html/css for incognito NTP and normal NTP if (!new_tab_html_.get()) @@ -42,7 +42,7 @@ RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { return new_tab_html_.get(); } -RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) { +base::RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) { // This is used for themes, which are not currently supported on Android. NOTIMPLEMENTED(); return NULL; diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index 51f6de0..3229bb9 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "base/callback.h" +#include "base/memory/ref_counted_memory.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" @@ -24,7 +25,7 @@ ThumbnailSource::~ThumbnailSource() { void ThumbnailSource::StartDataRequest(const std::string& path, bool is_incognito, int request_id) { - scoped_refptr<RefCountedMemory> data; + scoped_refptr<base::RefCountedMemory> data; if (top_sites_->GetPageThumbnail(GURL(path), &data)) { // We have the thumbnail. SendResponse(request_id, data.get()); diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.h b/chrome/browser/ui/webui/ntp/thumbnail_source.h index 9b86f19..52e0b8e 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.h +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,11 +10,14 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/memory/ref_counted_memory.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" class Profile; +namespace base { +class RefCountedMemory; +} + namespace history { class TopSites; } @@ -44,7 +47,7 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource { // Raw PNG representation of the thumbnail to show when the thumbnail // database doesn't have a thumbnail for a webpage. - scoped_refptr<RefCountedMemory> default_thumbnail_; + scoped_refptr<base::RefCountedMemory> default_thumbnail_; // TopSites. scoped_refptr<history::TopSites> top_sites_; diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc index 404c6f2..63f9c1a 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.cc +++ b/chrome/browser/ui/webui/options2/options_ui2.cc @@ -137,7 +137,7 @@ OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings) void OptionsUIHTMLSource::StartDataRequest(const std::string& path, bool is_incognito, int request_id) { - scoped_refptr<RefCountedMemory> response_bytes; + scoped_refptr<base::RefCountedMemory> response_bytes; SetFontAndTextDirection(localized_strings_.get()); if (path == kLocalizedStringsFile) { @@ -352,7 +352,7 @@ void OptionsUI::ProcessAutocompleteSuggestions( } // static -RefCountedMemory* OptionsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_SETTINGS_FAVICON); } diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h index 9cbf0c7..f45fb8e 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.h +++ b/chrome/browser/ui/webui/options2/options_ui2.h @@ -110,7 +110,7 @@ class OptionsUI : public content::WebUIController, const AutocompleteResult& autocompleteResult, base::ListValue * const suggestions); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); // Overridden from OptionsPageUIHandlerHost: virtual void InitializeHandlers() OVERRIDE; diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 47ee017..38d2bf5 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -480,7 +480,7 @@ PluginsUI::PluginsUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* PluginsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_PLUGIN); } diff --git a/chrome/browser/ui/webui/plugins_ui.h b/chrome/browser/ui/webui/plugins_ui.h index 4ed8443..9f5758c 100644 --- a/chrome/browser/ui/webui/plugins_ui.h +++ b/chrome/browser/ui/webui/plugins_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,13 +9,16 @@ #include "content/public/browser/web_ui_controller.h" class PrefService; + +namespace base { class RefCountedMemory; +} class PluginsUI : public content::WebUIController { public: explicit PluginsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); static void RegisterUserPrefs(PrefService* prefs); private: diff --git a/chrome/browser/ui/webui/sessions_ui.cc b/chrome/browser/ui/webui/sessions_ui.cc index d4424a0..3743b31 100644 --- a/chrome/browser/ui/webui/sessions_ui.cc +++ b/chrome/browser/ui/webui/sessions_ui.cc @@ -268,7 +268,7 @@ SessionsUI::SessionsUI(content::WebUI* web_ui) : WebUIController(web_ui) { } // static -RefCountedMemory* SessionsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* SessionsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_HISTORY_FAVICON); } diff --git a/chrome/browser/ui/webui/sessions_ui.h b/chrome/browser/ui/webui/sessions_ui.h index edc5747..5bdaaa9 100644 --- a/chrome/browser/ui/webui/sessions_ui.h +++ b/chrome/browser/ui/webui/sessions_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,13 +8,15 @@ #include "content/public/browser/web_ui_controller.h" +namespace base { class RefCountedMemory; +} class SessionsUI : public content::WebUIController { public: explicit SessionsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(SessionsUI); diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index b125bc7..2c2a59b 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -113,7 +113,8 @@ void ThemeSource::SendThemeBitmap(int request_id, int resource_id) { ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_); DCHECK(tp); - scoped_refptr<RefCountedMemory> image_data(tp->GetRawData(resource_id)); + scoped_refptr<base::RefCountedMemory> image_data(tp->GetRawData( + resource_id)); SendResponse(request_id, image_data); } else { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index c8fd72d..9e6c30e 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,10 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" class Profile; + +namespace base { class RefCountedMemory; +} class ThemeSource : public ChromeURLDataManager::DataSource { public: @@ -41,7 +44,7 @@ class ThemeSource : public ChromeURLDataManager::DataSource { Profile* profile_; // We grab the CSS early so we don't have to go back to the UI thread later. - scoped_refptr<RefCountedMemory> css_bytes_; + scoped_refptr<base::RefCountedMemory> css_bytes_; DISALLOW_COPY_AND_ASSIGN(ThemeSource); }; diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index ef5f154..0cd311e 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc @@ -24,7 +24,7 @@ class MockThemeSource : public ThemeSource { result_data_size_(0) { } - virtual void SendResponse(int request_id, RefCountedMemory* data) { + virtual void SendResponse(int request_id, base::RefCountedMemory* data) { result_data_size_ = data ? data->size() : 0; result_request_id_ = request_id; } diff --git a/chrome/browser/ui/webui/web_ui_util.cc b/chrome/browser/ui/webui/web_ui_util.cc index 3ec5bd9..4ef88e0 100644 --- a/chrome/browser/ui/webui/web_ui_util.cc +++ b/chrome/browser/ui/webui/web_ui_util.cc @@ -33,7 +33,7 @@ std::string GetImageDataUrlFromResource(int res) { ResourceBundle::GetSharedInstance().LoadDataResourceBytes(res); if (!icon_data) return std::string(); - scoped_refptr<RefCountedMemory> raw_icon(icon_data); + scoped_refptr<base::RefCountedMemory> raw_icon(icon_data); std::string str_url; str_url.insert(str_url.end(), raw_icon->front(), |