summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/l10n_util.cc2
-rw-r--r--base/mac_util.mm9
-rw-r--r--base/mach_ipc_mac.h6
-rw-r--r--base/scoped_nsobject.h35
-rw-r--r--chrome/browser/cocoa/applescript/bookmark_folder_applescript.h7
-rw-r--r--chrome/browser/cocoa/sidebar_controller.mm2
-rw-r--r--chrome/browser/cocoa/tabpose_window.h6
-rw-r--r--chrome/browser/download/download_manager.cc9
-rw-r--r--chrome/browser/net/gaia/token_service.cc6
-rw-r--r--chrome/browser/net/gaia/token_service.h6
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.mm2
-rw-r--r--chrome/browser/spellcheck_host.cc2
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc6
-rw-r--r--chrome/browser/web_applications/web_app.cc4
-rw-r--r--chrome/common/net/gaia/google_service_auth_error.h2
-rw-r--r--net/disk_cache/entry_impl.cc13
-rw-r--r--net/http/http_auth_gssapi_posix.cc36
17 files changed, 50 insertions, 103 deletions
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 824d054..7e1c75a 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -227,6 +227,7 @@ bool IsLocalePartiallyPopulated(const std::string& locale_name) {
return !IsLocaleNameTranslated("en", locale_name);
}
+#if !defined(OS_MACOSX)
bool IsLocaleAvailable(const std::string& locale,
const FilePath& locale_path) {
// If locale has any illegal characters in it, we don't want to try to
@@ -324,6 +325,7 @@ std::string GetSystemLocale() {
}
return ret;
}
+#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
// Split and normalize the language list specified by LANGUAGE environment.
diff --git a/base/mac_util.mm b/base/mac_util.mm
index 0f5064e..e017fe7 100644
--- a/base/mac_util.mm
+++ b/base/mac_util.mm
@@ -53,7 +53,7 @@ void SetUIMode() {
bool WasLaunchedAsLoginItem() {
ProcessSerialNumber psn = { 0, kCurrentProcess };
- scoped_nsobject<NSDictionary> process_info(
+ scoped_nsobject<const NSDictionary> process_info(
reinterpret_cast<const NSDictionary*>(
ProcessInformationCopyDictionary(&psn,
kProcessDictionaryIncludeAllInformationMask)));
@@ -62,7 +62,7 @@ bool WasLaunchedAsLoginItem() {
ProcessSerialNumber parent_psn =
{ (temp >> 32) & 0x00000000FFFFFFFFLL, temp & 0x00000000FFFFFFFFLL };
- scoped_nsobject<NSDictionary> parent_info(
+ scoped_nsobject<const NSDictionary> parent_info(
reinterpret_cast<const NSDictionary*>(
ProcessInformationCopyDictionary(&parent_psn,
kProcessDictionaryIncludeAllInformationMask)));
@@ -86,8 +86,9 @@ LSSharedFileListItemRef GetLoginItemForApp() {
return NULL;
}
- scoped_nsobject<NSArray> login_items_array(reinterpret_cast<const NSArray*>(
- LSSharedFileListCopySnapshot(login_items, NULL)));
+ scoped_nsobject<const NSArray> login_items_array(
+ reinterpret_cast<const NSArray*>(
+ LSSharedFileListCopySnapshot(login_items, NULL)));
NSURL* url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
diff --git a/base/mach_ipc_mac.h b/base/mach_ipc_mac.h
index 91b9729..d506a00 100644
--- a/base/mach_ipc_mac.h
+++ b/base/mach_ipc_mac.h
@@ -114,12 +114,6 @@ class MachMsgPortDescriptor : public mach_msg_port_descriptor_t {
return disposition;
}
- // We're just a simple wrapper for mach_msg_port_descriptor_t
- // and have the same memory layout
- operator mach_msg_port_descriptor_t&() {
- return *this;
- }
-
// For convenience
operator mach_port_t() const {
return GetMachPort();
diff --git a/base/scoped_nsobject.h b/base/scoped_nsobject.h
index e673a60..1b40ade 100644
--- a/base/scoped_nsobject.h
+++ b/base/scoped_nsobject.h
@@ -49,13 +49,8 @@ class scoped_nsobject {
object_ = object;
}
- bool operator==(NST* that) const {
- return object_ == that;
- }
-
- bool operator!=(NST* that) const {
- return object_ != that;
- }
+ bool operator==(NST* that) const { return object_ == that; }
+ bool operator!=(NST* that) const { return object_ != that; }
operator NST*() const {
return object_;
@@ -86,6 +81,23 @@ class scoped_nsobject {
DISALLOW_COPY_AND_ASSIGN(scoped_nsobject);
};
+// Free functions
+template <class C>
+void swap(scoped_nsobject<C>& p1, scoped_nsobject<C>& p2) {
+ p1.swap(p2);
+}
+
+template <class C>
+bool operator==(C* p1, const scoped_nsobject<C>& p2) {
+ return p1 == p2.get();
+}
+
+template <class C>
+bool operator!=(C* p1, const scoped_nsobject<C>& p2) {
+ return p1 != p2.get();
+}
+
+
// Specialization to make scoped_nsobject<id> work.
template<>
class scoped_nsobject<id> {
@@ -110,13 +122,8 @@ class scoped_nsobject<id> {
object_ = object;
}
- bool operator==(id that) const {
- return object_ == that;
- }
-
- bool operator!=(id that) const {
- return object_ != that;
- }
+ bool operator==(id that) const { return object_ == that; }
+ bool operator!=(id that) const { return object_ != that; }
operator id() const {
return object_;
diff --git a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
index c8969de..f56a3f9 100644
--- a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
+++ b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.h
@@ -9,6 +9,8 @@
#import "chrome/browser/cocoa/applescript/bookmark_node_applescript.h"
+@class BookmarkItemAppleScript;
+
// Represent a bookmark folder scriptable object in applescript.
@interface BookmarkFolderAppleScript : BookmarkNodeAppleScript {
@@ -38,12 +40,13 @@
- (NSArray*)bookmarkItems;
// Inserts a bookmark item at the end.
-- (void)insertInBookmarkItems:(id)aBookmarkItem;
+- (void)insertInBookmarkItems:(BookmarkItemAppleScript*)aBookmarkItem;
// Inserts a bookmark item at some position in the list.
// Called by applescript which takes care of bounds checking, make sure of it
// before calling directly.
-- (void)insertInBookmarkItems:(id)aBookmarkItem atIndex:(int)index;
+- (void)insertInBookmarkItems:(BookmarkItemAppleScript*)aBookmarkItem
+ atIndex:(int)index;
// Removes a bookmarks folder from the list.
// Called by applescript which takes care of bounds checking, make sure of it
diff --git a/chrome/browser/cocoa/sidebar_controller.mm b/chrome/browser/cocoa/sidebar_controller.mm
index c5a0081..b78570e 100644
--- a/chrome/browser/cocoa/sidebar_controller.mm
+++ b/chrome/browser/cocoa/sidebar_controller.mm
@@ -53,7 +53,7 @@ const int kMinWebWidth = 50;
[super dealloc];
}
-- (NSView*)view {
+- (NSSplitView*)view {
return splitView_.get();
}
diff --git a/chrome/browser/cocoa/tabpose_window.h b/chrome/browser/cocoa/tabpose_window.h
index 39958a2..fef3bbb 100644
--- a/chrome/browser/cocoa/tabpose_window.h
+++ b/chrome/browser/cocoa/tabpose_window.h
@@ -59,10 +59,10 @@ class TabStripModelObserverBridge;
// Stores all preview layers. The order in here matches the order in
// the tabstrip model.
- scoped_nsobject<NSArray> allThumbnailLayers_;
+ scoped_nsobject<NSMutableArray> allThumbnailLayers_;
- scoped_nsobject<NSArray> allFaviconLayers_;
- scoped_nsobject<NSArray> allTitleLayers_;
+ scoped_nsobject<NSMutableArray> allFaviconLayers_;
+ scoped_nsobject<NSMutableArray> allTitleLayers_;
// Manages the state of all layers.
scoped_ptr<tabpose::TileSet> tileSet_;
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index c409166..dd35022 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -49,15 +49,6 @@
#include "app/win_util.h"
#endif
-namespace {
-
-// Used to sort download items based on descending start time.
-bool CompareStartTime(DownloadItem* first, DownloadItem* second) {
- return first->start_time() > second->start_time();
-}
-
-} // namespace
-
DownloadManager::DownloadManager()
: shutdown_needed_(false),
profile_(NULL),
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc
index 1bf202a..0f2b1ac 100644
--- a/chrome/browser/net/gaia/token_service.cc
+++ b/chrome/browser/net/gaia/token_service.cc
@@ -110,11 +110,11 @@ void TokenService::EraseTokensFromDB() {
web_data_service_->RemoveAllTokens();
}
-const bool TokenService::AreCredentialsValid() const {
+bool TokenService::AreCredentialsValid() const {
return !credentials_.lsid.empty() && !credentials_.sid.empty();
}
-const bool TokenService::HasLsid() const {
+bool TokenService::HasLsid() const {
return !credentials_.lsid.empty();
}
@@ -134,7 +134,7 @@ void TokenService::StartFetchingTokens() {
// Services dependent on a token will check if a token is available.
// If it isn't, they'll go to sleep until they get a token event.
-const bool TokenService::HasTokenForService(const char* const service) const {
+bool TokenService::HasTokenForService(const char* const service) const {
return token_map_.count(service) > 0;
}
diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h
index 006423f..b6f1b3c 100644
--- a/chrome/browser/net/gaia/token_service.h
+++ b/chrome/browser/net/gaia/token_service.h
@@ -115,16 +115,16 @@ class TokenService : public GaiaAuthConsumer,
// For legacy services with their own auth routines, they can just read
// the LSID out directly. Deprecated.
- const bool HasLsid() const;
+ bool HasLsid() const;
const std::string& GetLsid() const;
// Did we get a proper LSID?
- const bool AreCredentialsValid() const;
+ bool AreCredentialsValid() const;
// Tokens will be fetched for all services(sync, talk) in the background.
// Results come back via event channel. Services can also poll before events
// are issued.
void StartFetchingTokens();
- const bool HasTokenForService(const char* const service) const;
+ bool HasTokenForService(const char* const service) const;
const std::string& GetTokenForService(const char* const service) const;
// For tests only. Doesn't save to the WebDB.
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index bd18a81..b727b81 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -849,7 +849,7 @@ RenderWidgetHostViewMac::AllocateFakePluginWindowHandle(bool opaque,
gfx::PluginWindowHandle handle =
plugin_container_manager_.AllocateFakePluginWindowHandle(opaque, root);
- scoped_nsobject<NSView> plugin_view(
+ scoped_nsobject<AcceleratedPluginView> plugin_view(
[[AcceleratedPluginView alloc] initWithRenderWidgetHostViewMac:this
pluginHandle:handle]);
[plugin_view setHidden:YES];
diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc
index c8ab3ac..5413ce5 100644
--- a/chrome/browser/spellcheck_host.cc
+++ b/chrome/browser/spellcheck_host.cc
@@ -31,11 +31,13 @@ FilePath GetFirstChoiceFilePath(const std::string& language) {
return SpellCheckCommon::GetVersionedFileName(language, dict_dir);
}
+#if defined(OS_WIN)
FilePath GetFallbackFilePath(const FilePath& first_choice) {
FilePath dict_dir;
PathService::Get(chrome::DIR_USER_DATA, &dict_dir);
return dict_dir.Append(first_choice.BaseName());
}
+#endif
} // namespace
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index d40b99d..5edfb32 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1543,12 +1543,6 @@ void TabContents::AddPopup(TabContents* new_contents,
}
}
-namespace {
-bool TransitionIsReload(PageTransition::Type transition) {
- return PageTransition::StripQualifier(transition) == PageTransition::RELOAD;
-}
-}
-
void TabContents::ExpireInfoBars(
const NavigationController::LoadCommittedDetails& details) {
// Only hide InfoBars when the user has done something that makes the main
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index ae4bc68..99e004b 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -111,13 +111,16 @@ FilePath GetWebAppDataDirectory(const FilePath& root_dir,
return root_dir.Append(GetWebAppDir(url));
}
+#if defined(TOOLKIT_VIEWS)
// Predicator for sorting images from largest to smallest.
bool IconPrecedes(
const webkit_glue::WebApplicationInfo::IconInfo& left,
const webkit_glue::WebApplicationInfo::IconInfo& right) {
return left.width < right.width;
}
+#endif
+#if defined(OS_WIN)
// Calculates image checksum using MD5.
void GetImageCheckSum(const SkBitmap& image, MD5Digest* digest) {
DCHECK(digest);
@@ -126,7 +129,6 @@ void GetImageCheckSum(const SkBitmap& image, MD5Digest* digest) {
MD5Sum(image.getPixels(), image.getSize(), digest);
}
-#if defined(OS_WIN)
// Saves |image| as an |icon_file| with the checksum.
bool SaveIconWithCheckSum(const FilePath& icon_file, const SkBitmap& image) {
if (!IconUtil::CreateIconFileFromSkBitmap(image, icon_file))
diff --git a/chrome/common/net/gaia/google_service_auth_error.h b/chrome/common/net/gaia/google_service_auth_error.h
index 12119ea..966ef64 100644
--- a/chrome/common/net/gaia/google_service_auth_error.h
+++ b/chrome/common/net/gaia/google_service_auth_error.h
@@ -125,7 +125,7 @@ class GoogleServiceAuthError {
// The error information.
const State& state() const { return state_; }
const Captcha& captcha() const { return captcha_; }
- const int network_error() const {
+ int network_error() const {
return network_error_;
}
diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc
index 5b65344..8d9fab6 100644
--- a/net/disk_cache/entry_impl.cc
+++ b/net/disk_cache/entry_impl.cc
@@ -64,19 +64,6 @@ void SyncCallback::Discard() {
OnFileIOComplete(0);
}
-// Clears buffer before offset and after valid_len, knowing that the size of
-// buffer is kMaxBlockSize.
-void ClearInvalidData(char* buffer, int offset, int valid_len) {
- DCHECK_GE(offset, 0);
- DCHECK_GE(valid_len, 0);
- DCHECK(disk_cache::kMaxBlockSize >= offset + valid_len);
- if (offset)
- memset(buffer, 0, offset);
- int end = disk_cache::kMaxBlockSize - offset - valid_len;
- if (end)
- memset(buffer + offset + valid_len, 0, end);
-}
-
const int kMaxBufferSize = 1024 * 1024; // 1 MB.
} // namespace
diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
index db8f712..d6f73c4 100644
--- a/net/http/http_auth_gssapi_posix.cc
+++ b/net/http/http_auth_gssapi_posix.cc
@@ -299,42 +299,6 @@ std::string DescribeOid(GSSAPILibrary* gssapi_lib, const gss_OID oid) {
return output;
}
-std::string DescribeBuffer(const gss_buffer_t buffer) {
- if (!buffer)
- return "<NULL>";
- size_t length = buffer->length;
- std::string output(StringPrintf("(%" PRIuS ") ", length));
- if (!buffer->value) {
- output += "<NULL>";
- return output;
- }
- const char* value =
- reinterpret_cast<const char*>(buffer->value);
- bool is_printable = true;
- for (size_t i = 0; i < length; ++i) {
- if (!isprint(value[i])) {
- // Allow the last character to be a '0'.
- if ((i < (length - 1)) && !value[i])
- continue;
- is_printable = false;
- break;
- }
- }
- if (is_printable) {
- output += "\"";
- output += value;
- output += "\"";
- } else {
- output += "[";
- for (size_t i = 0; i < buffer->length; ++i) {
- output += StringPrintf("\\x%02X", value[i] & 0x0FF);
- }
- output += "]";
- }
-
- return output;
-}
-
std::string DescribeName(GSSAPILibrary* gssapi_lib, const gss_name_t name) {
OM_uint32 major_status = 0;
OM_uint32 minor_status = 0;
generated by cgit v1.1 at 2025-04-04 06:46:56 +0000