summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 12:54:04 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 12:54:04 +0000
commitf09c718082535c0de7f066cb63f95809070f35a6 (patch)
tree0c7bbd37cccef8748b8c6e1768d2d95f7989a1a0 /chrome/common
parent15567be3dd3dacb0abae800ede436eac8123482c (diff)
downloadchromium_src-f09c718082535c0de7f066cb63f95809070f35a6.zip
chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.gz
chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.bz2
NO CODE CHANGE.
Fix files with lines > 80 cols. Part 2. Review URL: http://codereview.chromium.org/40226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/gfx/chrome_font_skia.cc3
-rw-r--r--chrome/common/gfx/color_utils.cc7
-rw-r--r--chrome/common/gfx/text_elider.cc3
-rw-r--r--chrome/common/l10n_util.cc3
-rw-r--r--chrome/common/libxml_utils.h2
-rw-r--r--chrome/common/mach_ipc_mac.h13
-rw-r--r--chrome/common/message_router.cc6
-rw-r--r--chrome/common/net/url_request_intercept_job.cc3
-rw-r--r--chrome/common/notification_service_unittest.cc25
-rw-r--r--chrome/common/os_exchange_data_unittest.cc7
-rw-r--r--chrome/common/pref_service.h11
-rwxr-xr-xchrome/common/render_messages.h4
-rw-r--r--chrome/common/resource_bundle.cc2
-rw-r--r--chrome/common/resource_bundle_win.cc3
-rw-r--r--chrome/common/resource_dispatcher_unittest.cc3
-rw-r--r--chrome/common/stl_util-inl.h8
-rw-r--r--chrome/common/time_format_unittest.cc3
-rw-r--r--chrome/common/visitedlink_common.cc4
-rw-r--r--chrome/common/visitedlink_common.h7
-rw-r--r--chrome/common/win_safe_util.cc67
-rw-r--r--chrome/common/win_util.cc6
21 files changed, 77 insertions, 113 deletions
diff --git a/chrome/common/gfx/chrome_font_skia.cc b/chrome/common/gfx/chrome_font_skia.cc
index a309649..bd83a61 100644
--- a/chrome/common/gfx/chrome_font_skia.cc
+++ b/chrome/common/gfx/chrome_font_skia.cc
@@ -78,7 +78,8 @@ int ChromeFont::ave_char_width() const {
return avg_width_;
}
-ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, int font_size) {
+ChromeFont ChromeFont::CreateFont(const std::wstring& font_name,
+ int font_size) {
DCHECK_GT(font_size, 0);
SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_name).c_str(),
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc
index cdb4c0c..237e082 100644
--- a/chrome/common/gfx/color_utils.cc
+++ b/chrome/common/gfx/color_utils.cc
@@ -35,7 +35,8 @@ static const double kK = 903.3;
static double CIEConvertNonLinear(uint8 color_component) {
double color_component_d = static_cast<double>(color_component) / 255.0;
if (color_component_d > 0.04045) {
- double base = (color_component_d + kCIEConversionAlpha) / (1 + kCIEConversionAlpha);
+ double base = (color_component_d + kCIEConversionAlpha) /
+ (1 + kCIEConversionAlpha);
return pow(base, kCIEConversionGamma);
} else {
return color_component_d / 12.92;
@@ -86,7 +87,9 @@ static uint8 sRGBColorComponentFromLinearComponent(double component) {
if (component <= 0.0031308) {
result = 12.92 * component;
} else {
- result = (1 + kCIEConversionAlpha) * pow(component, (static_cast<double>(1) / 2.4)) - kCIEConversionAlpha;
+ result = (1 + kCIEConversionAlpha) *
+ pow(component, (static_cast<double>(1) / 2.4)) -
+ kCIEConversionAlpha;
}
return std::min(static_cast<uint8>(255), static_cast<uint8>(result * 255));
}
diff --git a/chrome/common/gfx/text_elider.cc b/chrome/common/gfx/text_elider.cc
index f4a6d4e..9510a8e 100644
--- a/chrome/common/gfx/text_elider.cc
+++ b/chrome/common/gfx/text_elider.cc
@@ -376,7 +376,8 @@ void AppendFormattedComponent(const std::string& spec,
out_component->begin = static_cast<int>(output->length());
output->append(UnescapeAndDecodeUTF8URLComponent(
- spec.substr(in_component.begin, in_component.len), UnescapeRule::NORMAL));
+ spec.substr(in_component.begin, in_component.len),
+ UnescapeRule::NORMAL));
out_component->len =
static_cast<int>(output->length()) - out_component->begin;
diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc
index 2c13dde..5f02b1c 100644
--- a/chrome/common/l10n_util.cc
+++ b/chrome/common/l10n_util.cc
@@ -376,7 +376,8 @@ std::wstring TruncateString(const std::wstring& string, size_t length) {
// Use a line iterator to find the first boundary.
UErrorCode status = U_ZERO_ERROR;
scoped_ptr<RuleBasedBreakIterator> bi(static_cast<RuleBasedBreakIterator*>(
- RuleBasedBreakIterator::createLineInstance(Locale::getDefault(), status)));
+ RuleBasedBreakIterator::createLineInstance(Locale::getDefault(),
+ status)));
if (U_FAILURE(status))
return string.substr(0, max) + kElideString;
bi->setText(string_utf16.c_str());
diff --git a/chrome/common/libxml_utils.h b/chrome/common/libxml_utils.h
index 890b8e2..3089bd4 100644
--- a/chrome/common/libxml_utils.h
+++ b/chrome/common/libxml_utils.h
@@ -163,7 +163,7 @@ class XmlWriter {
BAD_CAST content.c_str()) >= 0;
}
- // Helper functions not provided by xmlTextWriter ----------------------------------
+ // Helper functions not provided by xmlTextWriter ---------------------------
// Returns the string that has been written to the buffer.
std::string GetWrittenString() {
diff --git a/chrome/common/mach_ipc_mac.h b/chrome/common/mach_ipc_mac.h
index 74b84cf..8c345dd 100644
--- a/chrome/common/mach_ipc_mac.h
+++ b/chrome/common/mach_ipc_mac.h
@@ -63,8 +63,8 @@
//
// char messageString[] = "Hello server!\n";
// message.SetData(messageString, strlen(messageString)+1);
-//
-// kern_return_t result = sender.SendMessage(message, 1000); // timeout 1000ms
+// // timeout 1000ms
+// kern_return_t result = sender.SendMessage(message, 1000);
//
#define PRINT_MACH_RESULT(result_, message_) \
@@ -194,9 +194,9 @@ class MachMessage {
// Represents raw data in our message
struct MessageDataPacket {
- int32_t id; // little-endian
- int32_t data_length; // little-endian
- u_int8_t data[1]; // actual size limited by storage_length_bytes_
+ int32_t id; // little-endian
+ int32_t data_length; // little-endian
+ u_int8_t data[1]; // actual size limited by storage_length_bytes_
};
MessageDataPacket* GetDataPacket();
@@ -222,7 +222,8 @@ class MachMessage {
u_int8_t padding[1024];
};
- // kEmptyMessageSize needs to have the definition of MachMessageData before it.NNN
+ // kEmptyMessageSize needs to have the definition of MachMessageData before
+ // it.
public:
// The size of an empty message with no data.
static const size_t kEmptyMessageSize = sizeof(mach_msg_header_t) +
diff --git a/chrome/common/message_router.cc b/chrome/common/message_router.cc
index a05e42d..9e62b71 100644
--- a/chrome/common/message_router.cc
+++ b/chrome/common/message_router.cc
@@ -6,11 +6,13 @@
#include "chrome/common/render_messages.h"
void MessageRouter::OnControlMessageReceived(const IPC::Message& msg) {
- NOTREACHED() << "should override in subclass if you care about control messages";
+ NOTREACHED() <<
+ "should override in subclass if you care about control messages";
}
bool MessageRouter::Send(IPC::Message* msg) {
- NOTREACHED() << "should override in subclass if you care about sending messages";
+ NOTREACHED() <<
+ "should override in subclass if you care about sending messages";
return false;
}
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index 733967e..fb1f15b 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.cc
@@ -144,7 +144,8 @@ void URLRequestInterceptJob::GetResponseInfo(net::HttpResponseInfo* info) {
new net::X509Certificate(request_->url().GetWithEmptyPath().spec(),
kCertIssuer,
Time::Now(),
- Time::Now() + TimeDelta::FromDays(kLifetimeDays));
+ Time::Now() +
+ TimeDelta::FromDays(kLifetimeDays));
info->ssl_info.cert_status = 0;
info->ssl_info.security_bits = 0;
}
diff --git a/chrome/common/notification_service_unittest.cc b/chrome/common/notification_service_unittest.cc
index db46356..0c948d6 100644
--- a/chrome/common/notification_service_unittest.cc
+++ b/chrome/common/notification_service_unittest.cc
@@ -141,8 +141,9 @@ TEST(NotificationServiceTest, Basic) {
EXPECT_EQ(1, idle_test_source.notification_count());
// Removing an observer that isn't there is a no-op, this should be fine.
- service->RemoveObserver(
- &all_types_all_sources, NotificationType::ALL, NotificationService::AllSources());
+ service->RemoveObserver(&all_types_all_sources,
+ NotificationType::ALL,
+ NotificationService::AllSources());
}
TEST(NotificationServiceTest, MultipleRegistration) {
@@ -152,26 +153,30 @@ TEST(NotificationServiceTest, MultipleRegistration) {
NotificationService* service = NotificationService::current();
- service->AddObserver(
- &idle_test_source, NotificationType::IDLE, Source<TestSource>(&test_source));
- service->AddObserver(
- &idle_test_source, NotificationType::ALL, Source<TestSource>(&test_source));
+ service->AddObserver(&idle_test_source,
+ NotificationType::IDLE,
+ Source<TestSource>(&test_source));
+ service->AddObserver(&idle_test_source,
+ NotificationType::ALL,
+ Source<TestSource>(&test_source));
service->Notify(NotificationType::IDLE,
Source<TestSource>(&test_source),
NotificationService::NoDetails());
EXPECT_EQ(2, idle_test_source.notification_count());
- service->RemoveObserver(
- &idle_test_source, NotificationType::IDLE, Source<TestSource>(&test_source));
+ service->RemoveObserver(&idle_test_source,
+ NotificationType::IDLE,
+ Source<TestSource>(&test_source));
service->Notify(NotificationType::IDLE,
Source<TestSource>(&test_source),
NotificationService::NoDetails());
EXPECT_EQ(3, idle_test_source.notification_count());
- service->RemoveObserver(
- &idle_test_source, NotificationType::ALL, Source<TestSource>(&test_source));
+ service->RemoveObserver(&idle_test_source,
+ NotificationType::ALL,
+ Source<TestSource>(&test_source));
service->Notify(NotificationType::IDLE,
Source<TestSource>(&test_source),
diff --git a/chrome/common/os_exchange_data_unittest.cc b/chrome/common/os_exchange_data_unittest.cc
index f199c10..869ee92 100644
--- a/chrome/common/os_exchange_data_unittest.cc
+++ b/chrome/common/os_exchange_data_unittest.cc
@@ -259,7 +259,8 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) {
// File contents access via COM
CComPtr<IDataObject> com_data(data);
{
- CLIPFORMAT cfstr_file_contents = RegisterClipboardFormat(CFSTR_FILECONTENTS);
+ CLIPFORMAT cfstr_file_contents =
+ RegisterClipboardFormat(CFSTR_FILECONTENTS);
FORMATETC format_etc =
{ cfstr_file_contents, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
EXPECT_EQ(S_OK, com_data->QueryGetData(&format_etc));
@@ -268,7 +269,9 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) {
EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium));
ScopedHGlobal<char> glob(medium.hGlobal);
std::string output(glob.get(), glob.Size());
- std::string file_contents = "[InternetShortcut]\r\nURL=" + url_spec + "\r\n";
+ std::string file_contents = "[InternetShortcut]\r\nURL=";
+ file_contents += url_spec;
+ file_contents += "\r\n";
EXPECT_EQ(file_contents, output);
ReleaseStgMedium(&medium);
}
diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h
index f5377d2..3ab6965 100644
--- a/chrome/common/pref_service.h
+++ b/chrome/common/pref_service.h
@@ -56,8 +56,8 @@ class PrefService : public NonThreadSafe {
// browser.window_placement).
const std::wstring name() const { return name_; }
- // Returns the value of the Preference. If there is no user specified value,
- // it returns the default value.
+ // Returns the value of the Preference. If there is no user specified
+ // value, it returns the default value.
const Value* GetValue() const;
// Returns true if the current value matches the default value.
@@ -76,7 +76,8 @@ class PrefService : public NonThreadSafe {
DISALLOW_COPY_AND_ASSIGN(Preference);
};
- // |pref_filename| is the path to the prefs file we will try to load or save to.
+ // |pref_filename| is the path to the prefs file we will try to load or save
+ // to.
explicit PrefService(const FilePath& pref_filename);
~PrefService();
@@ -128,8 +129,8 @@ class PrefService : public NonThreadSafe {
bool IsPrefRegistered(const wchar_t* path);
// If the path is valid and the value at the end of the path matches the type
- // specified, it will return the specified value. Otherwise, the default value
- // (set when the pref was registered) will be returned.
+ // specified, it will return the specified value. Otherwise, the default
+ // value (set when the pref was registered) will be returned.
bool GetBoolean(const wchar_t* path) const;
int GetInteger(const wchar_t* path) const;
double GetReal(const wchar_t* path) const;
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 582bf3a..462d853 100755
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1337,7 +1337,9 @@ struct ParamTraits<ResourceResponseHead> {
}
static bool Read(const Message* m, void** iter, param_type* r) {
return
- ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m, iter, r) &&
+ ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m,
+ iter,
+ r) &&
ReadParam(m, iter, &r->status) &&
ReadParam(m, iter, &r->filter_policy);
}
diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
index 29bb679..cfaf10d 100644
--- a/chrome/common/resource_bundle.cc
+++ b/chrome/common/resource_bundle.cc
@@ -92,7 +92,7 @@ SkBitmap* ResourceBundle::LoadBitmap(DataHandle data_handle, int resource_id) {
// Decode the PNG.
int image_width;
int image_height;
- if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(),
+ if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(),
PNGDecoder::FORMAT_BGRA,
&png_data, &image_width, &image_height)) {
NOTREACHED() << "Unable to decode image resource " << resource_id;
diff --git a/chrome/common/resource_bundle_win.cc b/chrome/common/resource_bundle_win.cc
index 377ba4e..27b0b36 100644
--- a/chrome/common/resource_bundle_win.cc
+++ b/chrome/common/resource_bundle_win.cc
@@ -58,7 +58,8 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
// The dll should only have resources, not executable code.
locale_resources_data_ = LoadLibraryEx(locale_path.value().c_str(), NULL,
GetDataDllLoadFlags());
- DCHECK(locale_resources_data_ != NULL) << "unable to load generated resources";
+ DCHECK(locale_resources_data_ != NULL) <<
+ "unable to load generated resources";
}
FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index e4c8792..518ee7c 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -114,7 +114,8 @@ class ResourceDispatcherTest : public testing::Test,
base::SharedMemoryHandle dup_handle;
EXPECT_TRUE(shared_mem.GiveToProcess(
base::Process::Current().handle(), &dup_handle));
- dispatcher_->OnReceivedData(request_id, dup_handle, test_page_contents_len);
+ dispatcher_->OnReceivedData(request_id, dup_handle,
+ test_page_contents_len);
message_queue_.erase(message_queue_.begin());
diff --git a/chrome/common/stl_util-inl.h b/chrome/common/stl_util-inl.h
index 7c4983a..f13de2b 100644
--- a/chrome/common/stl_util-inl.h
+++ b/chrome/common/stl_util-inl.h
@@ -196,8 +196,12 @@ inline bool
HashSetEquality(const HashSet& set_a,
const HashSet& set_b) {
if (set_a.size() != set_b.size()) return false;
- for (typename HashSet::const_iterator i = set_a.begin(); i != set_a.end(); ++i)
- if (set_b.find(*i) == set_b.end()) return false;
+ for (typename HashSet::const_iterator i = set_a.begin();
+ i != set_a.end();
+ ++i) {
+ if (set_b.find(*i) == set_b.end())
+ return false;
+ }
return true;
}
diff --git a/chrome/common/time_format_unittest.cc b/chrome/common/time_format_unittest.cc
index 07119d1..bc99ee4 100644
--- a/chrome/common/time_format_unittest.cc
+++ b/chrome/common/time_format_unittest.cc
@@ -57,7 +57,8 @@ TEST(TimeFormat, RemainingTime) {
TestRemainingTime(twohundred_millisecs, L"0 secs", L"0 secs left");
TestRemainingTime(one_sec - twohundred_millisecs, L"0 secs", L"0 secs left");
TestRemainingTime(one_sec + twohundred_millisecs, L"1 sec", L"1 sec left");
- TestRemainingTime(five_secs + twohundred_millisecs, L"5 secs", L"5 secs left");
+ TestRemainingTime(five_secs + twohundred_millisecs, L"5 secs",
+ L"5 secs left");
TestRemainingTime(one_min + five_secs, L"1 min", L"1 min left");
TestRemainingTime(three_mins + twohundred_millisecs,
L"3 mins", L"3 mins left");
diff --git a/chrome/common/visitedlink_common.cc b/chrome/common/visitedlink_common.cc
index 6bda05d..c694859 100644
--- a/chrome/common/visitedlink_common.cc
+++ b/chrome/common/visitedlink_common.cc
@@ -62,8 +62,8 @@ bool VisitedLinkCommon::IsVisited(Fingerprint fingerprint) const {
// Uses the top 64 bits of the MD5 sum of the canonical URL as the fingerprint,
// this is as random as any other subset of the MD5SUM.
//
-// FIXME: this uses the MD5SUM of the 16-bit character version. For systems where
-// wchar_t is not 16 bits (Linux uses 32 bits, I think), this will not be
+// FIXME: this uses the MD5SUM of the 16-bit character version. For systems
+// where wchar_t is not 16 bits (Linux uses 32 bits, I think), this will not be
// compatable. We should define explicitly what should happen here across
// platforms, and convert if necessary (probably to UTF-16).
diff --git a/chrome/common/visitedlink_common.h b/chrome/common/visitedlink_common.h
index 06a4f5c..35cadb7 100644
--- a/chrome/common/visitedlink_common.h
+++ b/chrome/common/visitedlink_common.h
@@ -91,8 +91,8 @@ class VisitedLinkCommon {
};
// Returns the fingerprint at the given index into the URL table. This
- // function should be called instead of accessing the table directly to contain
- // endian issues.
+ // function should be called instead of accessing the table directly to
+ // contain endian issues.
Fingerprint FingerprintAt(int32 table_offset) const {
DCHECK(hash_table_);
if (!hash_table_)
@@ -113,7 +113,8 @@ class VisitedLinkCommon {
static Hash HashFingerprint(Fingerprint fingerprint, int32 table_length) {
return static_cast<Hash>(fingerprint % table_length);
}
- Hash HashFingerprint(Fingerprint fingerprint) const { // uses the current hashtable
+ // Uses the current hashtable.
+ Hash HashFingerprint(Fingerprint fingerprint) const {
return HashFingerprint(fingerprint, table_length_);
}
diff --git a/chrome/common/win_safe_util.cc b/chrome/common/win_safe_util.cc
index 70782ee..f4c45c4 100644
--- a/chrome/common/win_safe_util.cc
+++ b/chrome/common/win_safe_util.cc
@@ -16,73 +16,6 @@
namespace win_util {
-// This is the COM IAttachmentExecute interface definition.
-// In the current Chrome headers it is not present because the _WIN32_IE macro
-// is not set at the XPSP2 or IE60 level. We have placed guards to avoid double
-// declaration in case we change the _WIN32_IE macro.
-#ifndef __IAttachmentExecute_INTERFACE_DEFINED__
-#define __IAttachmentExecute_INTERFACE_DEFINED__
-
-typedef
-enum tagATTACHMENT_PROMPT
-{ ATTACHMENT_PROMPT_NONE = 0,
-ATTACHMENT_PROMPT_SAVE = 0x1,
-ATTACHMENT_PROMPT_EXEC = 0x2,
-ATTACHMENT_PROMPT_EXEC_OR_SAVE = 0x3
-} ATTACHMENT_PROMPT;
-
-typedef
-enum tagATTACHMENT_ACTION
-{ ATTACHMENT_ACTION_CANCEL = 0,
-ATTACHMENT_ACTION_SAVE = 0x1,
-ATTACHMENT_ACTION_EXEC = 0x2
-} ATTACHMENT_ACTION;
-
-MIDL_INTERFACE("73db1241-1e85-4581-8e4f-a81e1d0f8c57")
-IAttachmentExecute : public IUnknown
-{
-public:
- virtual HRESULT STDMETHODCALLTYPE SetClientTitle(
- /* [string][in] */ LPCWSTR pszTitle) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SetClientGuid(
- /* [in] */ REFGUID guid) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SetLocalPath(
- /* [string][in] */ LPCWSTR pszLocalPath) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SetFileName(
- /* [string][in] */ LPCWSTR pszFileName) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SetSource(
- /* [string][in] */ LPCWSTR pszSource) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SetReferrer(
- /* [string][in] */ LPCWSTR pszReferrer) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE CheckPolicy( void) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE Prompt(
- /* [in] */ HWND hwnd,
- /* [in] */ ATTACHMENT_PROMPT prompt,
- /* [out] */ ATTACHMENT_ACTION *paction) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE Save( void) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE Execute(
- /* [in] */ HWND hwnd,
- /* [string][in] */ LPCWSTR pszVerb,
- HANDLE *phProcess) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE SaveWithUI(
- HWND hwnd) = 0;
-
- virtual HRESULT STDMETHODCALLTYPE ClearClientState( void) = 0;
-
-};
-
-#endif // __IAttachmentExecute_INTERFACE_DEFINED__
-
// This function implementation is based on the attachment execution
// services functionally deployed with IE6 or Service pack 2. This
// functionality is exposed in the IAttachmentExecute COM interface.
diff --git a/chrome/common/win_util.cc b/chrome/common/win_util.cc
index 7437031..07a1b08 100644
--- a/chrome/common/win_util.cc
+++ b/chrome/common/win_util.cc
@@ -116,7 +116,8 @@ std::wstring FormatSystemDate(const SYSTEMTIME& date,
return output;
}
-bool ConvertToLongPath(const std::wstring& short_path, std::wstring* long_path) {
+bool ConvertToLongPath(const std::wstring& short_path,
+ std::wstring* long_path) {
wchar_t long_path_buf[MAX_PATH];
DWORD return_value = GetLongPathName(short_path.c_str(), long_path_buf,
MAX_PATH);
@@ -172,7 +173,8 @@ void ShowItemInFolder(const std::wstring& full_path) {
PCUITEMID_CHILD_ARRAY pidls,
DWORD flags);
- static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr = NULL;
+ static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
+ NULL;
static bool initialize_open_folder_proc = true;
if (initialize_open_folder_proc) {
initialize_open_folder_proc = false;