NO CODE CHANGE.
Split the lines >80 cols. (Part 1)
Review URL: http://codereview.chromium.org/39206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11032 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/icu_util.cc b/base/icu_util.cc
index dc8302c..4821fefe 100644
--- a/base/icu_util.cc
+++ b/base/icu_util.cc
@@ -34,11 +34,11 @@
#define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_FILE
#endif
-#endif // ICU_UTIL_DATA_IMPL
+#endif // ICU_UTIL_DATA_IMPL
#if defined(OS_WIN)
-#define ICU_UTIL_DATA_SYMBOL "icudt38_dat"
-#define ICU_UTIL_DATA_SHARED_MODULE_NAME L"icudt38.dll"
+#define ICU_UTIL_DATA_SYMBOL "icudt38_dat"
+#define ICU_UTIL_DATA_SHARED_MODULE_NAME L"icudt38.dll"
#endif
namespace icu_util {
diff --git a/base/logging.h b/base/logging.h
index baedb8b..ee3ab409 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -259,7 +259,9 @@
extern std::string* MakeCheckOpStringIntInt(int v1, int v2, const char* names);
template<int, int>
-std::string* MakeCheckOpString(const int& v1, const int& v2, const char* names) {
+std::string* MakeCheckOpString(const int& v1,
+ const int& v2,
+ const char* names) {
return MakeCheckOpStringIntInt(v1, v2, names);
}
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index 18abde0b..d9c3143 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -80,10 +80,11 @@
}
//static
-AutocompleteInput::Type AutocompleteInput::Parse(const std::wstring& text,
- const std::wstring& desired_tld,
- url_parse::Parsed* parts,
- std::wstring* scheme) {
+AutocompleteInput::Type AutocompleteInput::Parse(
+ const std::wstring& text,
+ const std::wstring& desired_tld,
+ url_parse::Parsed* parts,
+ std::wstring* scheme) {
DCHECK(parts);
const size_t first_non_white = text.find_first_not_of(kWhitespaceWide, 0);
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index ca77882..8cc5ced 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -313,7 +313,8 @@
}
// FALL THROUGH
- case NotificationType::AUTOCOMPLETE_CONTROLLER_SYNCHRONOUS_MATCHES_AVAILABLE: {
+ case NotificationType::
+ AUTOCOMPLETE_CONTROLLER_SYNCHRONOUS_MATCHES_AVAILABLE: {
// Update the edit with the possibly new data for this match.
// NOTE: This must be done after the code above, so that our internal
// state will be consistent when the edit calls back to
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 7ecba26..25f53a64 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -584,8 +584,9 @@
matches->push_back(match);
}
-void HistoryURLProvider::RunAutocompletePasses(const AutocompleteInput& input,
- bool fixup_input_and_run_pass_1) {
+void HistoryURLProvider::RunAutocompletePasses(
+ const AutocompleteInput& input,
+ bool fixup_input_and_run_pass_1) {
matches_.clear();
if ((input.type() != AutocompleteInput::UNKNOWN) &&
diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc
index 941c96b0..c7dadd5 100644
--- a/chrome/browser/autocomplete/keyword_provider_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc
@@ -45,7 +45,8 @@
{ L"z", L"%s=z", L"z" },
};
- model_.reset(new TemplateURLModel(kTestKeywordData, arraysize(kTestKeywordData)));
+ model_.reset(new TemplateURLModel(kTestKeywordData,
+ arraysize(kTestKeywordData)));
kw_provider_ = new KeywordProvider(NULL, model_.get());
}
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 18a6bc05..2d33794b02 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -58,7 +58,8 @@
// Always open the first tab in the foreground.
disposition = NEW_FOREGROUND_TAB;
}
- browser_->OpenURLFromTab(NULL, url, referrer, NEW_FOREGROUND_TAB, transition);
+ browser_->OpenURLFromTab(NULL, url, referrer, NEW_FOREGROUND_TAB,
+ transition);
}
private:
@@ -134,7 +135,8 @@
}
}
-bool ShouldOpenAll(gfx::NativeWindow parent, const std::vector<BookmarkNode*>& nodes) {
+bool ShouldOpenAll(gfx::NativeWindow parent,
+ const std::vector<BookmarkNode*>& nodes) {
int descendant_count = 0;
for (size_t i = 0; i < nodes.size(); ++i)
descendant_count += DescendantURLCount(nodes[i]);
diff --git a/chrome/browser/cache_manager_host.cc b/chrome/browser/cache_manager_host.cc
index 241dbf1..da6ec4c 100644
--- a/chrome/browser/cache_manager_host.cc
+++ b/chrome/browser/cache_manager_host.cc
@@ -339,7 +339,8 @@
AttemptTactic(KEEP_LIVE, active, DIVIDE_EVENLY, inactive, &strategy) ||
// We're basically out of memory. The best we can do is just divide up
// what we have and soldier on.
- AttemptTactic(DIVIDE_EVENLY, active, DIVIDE_EVENLY, inactive, &strategy)) {
+ AttemptTactic(DIVIDE_EVENLY, active, DIVIDE_EVENLY, inactive,
+ &strategy)) {
// Having found a workable strategy, we enact it.
EnactStrategy(strategy);
} else {
diff --git a/chrome/browser/cache_manager_host_unittest.cc b/chrome/browser/cache_manager_host_unittest.cc
index e04c12c..c36ffe5d 100644
--- a/chrome/browser/cache_manager_host_unittest.cc
+++ b/chrome/browser/cache_manager_host_unittest.cc
@@ -24,7 +24,8 @@
static const CacheManager::UsageStats kStats2;
// Thunks to access protected members of CacheManagerHost
- static std::map<int, CacheManagerHost::RendererInfo>& stats(CacheManagerHost* h) {
+ static std::map<int, CacheManagerHost::RendererInfo>& stats(
+ CacheManagerHost* h) {
return h->stats_;
}
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index c47e6d02..74086fc 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -85,7 +85,8 @@
return &locale_dependent_encoding_ids_;
}
- std::vector<CharacterEncoding::EncodingInfo>* const current_display_encodings() {
+ std::vector<CharacterEncoding::EncodingInfo>* const
+ current_display_encodings() {
return ¤t_display_encodings_;
}
@@ -98,7 +99,8 @@
DISALLOW_EVIL_CONSTRUCTORS(CanonicalEncodingMap);
};
-const IdToCanonicalEncodingNameMapType* CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
+const IdToCanonicalEncodingNameMapType*
+ CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
// Testing and building map is not thread safe, this function is supposed to
// only run in UI thread. Myabe I should add a lock in here for making it as
// thread safe.
@@ -114,7 +116,8 @@
return id_to_encoding_name_map_.get();
}
-const CanonicalEncodingNameToIdMapType* CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
+const CanonicalEncodingNameToIdMapType*
+ CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
if (!encoding_name_to_id_map_.get()) {
encoding_name_to_id_map_.reset(new CanonicalEncodingNameToIdMapType);
for (int i = 0; i < canonical_encoding_names_length; ++i) {
@@ -337,7 +340,8 @@
// FireFox, we always put UTF-8 as toppest position, after then put user
// recently selected encodings, then put local dependent encoding items.
// At last, we put all rest encoding items.
-const std::vector<CharacterEncoding::EncodingInfo>* CharacterEncoding::GetCurrentDisplayEncodings(
+const std::vector<CharacterEncoding::EncodingInfo>*
+ CharacterEncoding::GetCurrentDisplayEncodings(
const std::wstring& locale,
const std::wstring& locale_encodings,
const std::wstring& recently_select_encodings) {
diff --git a/chrome/browser/cocoa/toolbar_button_cell.h b/chrome/browser/cocoa/toolbar_button_cell.h
index a46cfff..a0991d2 100644
--- a/chrome/browser/cocoa/toolbar_button_cell.h
+++ b/chrome/browser/cocoa/toolbar_button_cell.h
@@ -15,7 +15,7 @@
kLeftButtonType = -1,
kLeftButtonWithShadowType = -2,
kStandardButtonType = 0,
- kRightButtonType = 1,
+ kRightButtonType = 1,
};
typedef NSInteger ButtonType;
diff --git a/chrome/browser/debugger/debugger_io_socket.cc b/chrome/browser/debugger/debugger_io_socket.cc
index 30c5ac1..a7b857e 100644
--- a/chrome/browser/debugger/debugger_io_socket.cc
+++ b/chrome/browser/debugger/debugger_io_socket.cc
@@ -92,7 +92,8 @@
this, &DebuggerInputOutputSocket::OutputToSocket, out, lf));
}
-void DebuggerInputOutputSocket::OutputToSocket(const std::string& out, bool lf) {
+void DebuggerInputOutputSocket::OutputToSocket(const std::string& out,
+ bool lf) {
DCHECK(MessageLoop::current() == io_loop_);
if (connection_) {
if (out.length()) {
diff --git a/chrome/browser/debugger/debugger_io_socket.h b/chrome/browser/debugger/debugger_io_socket.h
index 551e14df..ea7c522 100644
--- a/chrome/browser/debugger/debugger_io_socket.h
+++ b/chrome/browser/debugger/debugger_io_socket.h
@@ -12,9 +12,9 @@
class MessageLoop;
// Interaction with the underlying Socket object MUST happen in the IO thread.
-// However, Debugger will call into this object from the main thread. As a result
-// we wind up having helper methods that we call with InvokeLater into the IO
-// thread.
+// However, Debugger will call into this object from the main thread. As a
+// result we wind up having helper methods that we call with InvokeLater into
+// the IO thread.
class DebuggerInputOutputSocket: public DebuggerInputOutput,
public ListenSocket::ListenSocketDelegate {
diff --git a/chrome/browser/debugger/debugger_node.cc b/chrome/browser/debugger/debugger_node.cc
index 31374c6..2007575 100644
--- a/chrome/browser/debugger/debugger_node.cc
+++ b/chrome/browser/debugger/debugger_node.cc
@@ -69,12 +69,14 @@
}
v8::Local<v8::ObjectTemplate> instance = templ->InstanceTemplate();
if (IsObject()) {
- instance->SetNamedPropertyHandler(&DebuggerNode::NodeGetter, 0, 0, 0, 0, node);
+ instance->SetNamedPropertyHandler(&DebuggerNode::NodeGetter, 0, 0, 0, 0,
+ node);
// TODO(erikkay): verify that the interceptor does not have to be
// behind the object
}
if (IsCollection()) {
- instance->SetIndexedPropertyHandler(&DebuggerNode::NodeIndex, 0, 0, 0, 0, node);
+ instance->SetIndexedPropertyHandler(&DebuggerNode::NodeIndex, 0, 0, 0, 0,
+ node);
}
v8::Local<v8::Object> ret = instance->NewInstance();
v8::Persistent<v8::Object> p = v8::Persistent<v8::Object>::New(ret);
@@ -84,8 +86,8 @@
v8::Handle<v8::Value> DebuggerNode::NodeGetter(v8::Local<v8::String> prop,
const v8::AccessorInfo& info) {
- DebuggerNodeWrapper* w =
- static_cast<DebuggerNodeWrapper*>(v8::External::Cast(*info.Data())->Value());
+ DebuggerNodeWrapper* w = static_cast<DebuggerNodeWrapper*>(v8::External::Cast(
+ *info.Data())->Value());
DebuggerNode* n = w->node();
if (n->IsValid() && n->IsObject()) {
return n->PropGetter(prop, info);
@@ -96,8 +98,8 @@
v8::Handle<v8::Value> DebuggerNode::NodeIndex(uint32_t index,
const v8::AccessorInfo& info) {
- DebuggerNodeWrapper* w =
- static_cast<DebuggerNodeWrapper*>(v8::External::Cast(*info.Data())->Value());
+ DebuggerNodeWrapper* w = static_cast<DebuggerNodeWrapper*>(v8::External::Cast(
+ *info.Data())->Value());
DebuggerNode* n = w->node();
if (n->IsValid() && n->IsCollection()) {
return n->IndexGetter(index, info);
@@ -107,8 +109,8 @@
}
v8::Handle<v8::Value> DebuggerNode::NodeFunc(const v8::Arguments& args) {
- DebuggerNodeWrapper* w =
- static_cast<DebuggerNodeWrapper*>(v8::External::Cast(*args.Data())->Value());
+ DebuggerNodeWrapper* w = static_cast<DebuggerNodeWrapper*>(v8::External::Cast(
+ *args.Data())->Value());
DebuggerNode* n = w->node();
if (n->IsValid() && n->IsFunction()) {
return n->Function(args);
@@ -137,11 +139,13 @@
return node->NewInstance();
} else if (prop->Equals(v8::String::New("setDebuggerReady"))) {
FunctionNode<DebuggerShell>* f =
- new FunctionNode<DebuggerShell>(DebuggerShell::SetDebuggerReady, debugger_);
+ new FunctionNode<DebuggerShell>(DebuggerShell::SetDebuggerReady,
+ debugger_);
return f->NewInstance();
} else if (prop->Equals(v8::String::New("setDebuggerBreak"))) {
FunctionNode<DebuggerShell>* f =
- new FunctionNode<DebuggerShell>(DebuggerShell::SetDebuggerBreak, debugger_);
+ new FunctionNode<DebuggerShell>(DebuggerShell::SetDebuggerBreak,
+ debugger_);
return f->NewInstance();
} else if (prop->Equals(v8::String::New("foo"))) {
return v8::Undefined();
diff --git a/chrome/browser/debugger/debugger_shell.cc b/chrome/browser/debugger/debugger_shell.cc
index 7b1af304..65695a6 100644
--- a/chrome/browser/debugger/debugger_shell.cc
+++ b/chrome/browser/debugger/debugger_shell.cc
@@ -85,7 +85,8 @@
CompileAndRun(debugger_shell_js, "chrome.dll/debugger_shell.js");
}
-void DebuggerShell::HandleWeakReference(v8::Persistent<v8::Value> obj, void* data) {
+void DebuggerShell::HandleWeakReference(v8::Persistent<v8::Value> obj,
+ void* data) {
DebuggerNodeWrapper* node = static_cast<DebuggerNodeWrapper*>(data);
node->Release();
}
@@ -113,7 +114,8 @@
return io_.get();
}
-v8::Handle<v8::Value> DebuggerShell::DelegateSubshell(const v8::Arguments& args) {
+v8::Handle<v8::Value> DebuggerShell::DelegateSubshell(
+ const v8::Arguments& args) {
DebuggerShell* debugger =
static_cast<DebuggerShell*>(v8::External::Cast(*args.Data())->Value());
return debugger->Subshell(args);
@@ -136,7 +138,8 @@
v8_context_->Global()->Set(v8::String::New("shell_"), shell_);
}
} else if (args[0]->IsObject()) {
- shell_ = v8::Persistent<v8::Object>::New(v8::Local<v8::Object>::Cast(args[0]));
+ shell_ =
+ v8::Persistent<v8::Object>::New(v8::Local<v8::Object>::Cast(args[0]));
v8_context_->Global()->Set(v8::String::New("shell_"), shell_);
}
return v8::Undefined();
@@ -235,7 +238,8 @@
v8::HandleScope scope;
if (msg.length()) {
- if ((msg[0] == L'{' || msg[0] == L'[' || msg[0] == L'(') && (!shell_.IsEmpty())) {
+ if ((msg[0] == L'{' || msg[0] == L'[' || msg[0] == L'(') &&
+ (!shell_.IsEmpty())) {
// v8's wide String constructor requires uint16 rather than wchar
const uint16* data = reinterpret_cast<const uint16* >(msg.c_str());
v8::Handle<v8::Value> argv[] = {v8::String::New(data)};
@@ -262,7 +266,8 @@
SubshellFunction("on_disconnect", 0, NULL);
}
-void DebuggerShell::ObjectToString(v8::Handle<v8::Value> result, std::wstring* str) {
+void DebuggerShell::ObjectToString(v8::Handle<v8::Value> result,
+ std::wstring* str) {
v8::HandleScope scope;
if (!result.IsEmpty() && !result->IsUndefined()) {
v8::Local<v8::String> str_obj = result->ToString();
@@ -277,7 +282,8 @@
}
}
-void DebuggerShell::ObjectToString(v8::Handle<v8::Value> result, std::string* str) {
+void DebuggerShell::ObjectToString(v8::Handle<v8::Value> result,
+ std::string* str) {
v8::HandleScope scope;
if (!result.IsEmpty() && !result->IsUndefined()) {
v8::Local<v8::String> str_obj = result->ToString();
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index ce73635c..d4fab0a9 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -288,7 +288,7 @@
}
if (url.host() == DebuggerContents::GetBaseURL().host()) {
return new DebuggerContents(this);
- }
+ }
if (url.host() == DevToolsUI::GetBaseURL().host()) {
return new DevToolsUI(this);
}
diff --git a/chrome/browser/dom_ui/dom_ui_host.cc b/chrome/browser/dom_ui/dom_ui_host.cc
index 21573989..17bc48c 100644
--- a/chrome/browser/dom_ui/dom_ui_host.cc
+++ b/chrome/browser/dom_ui/dom_ui_host.cc
@@ -74,7 +74,7 @@
void DOMUIHost::ProcessDOMUIMessage(const std::string& message,
const std::string& content) {
// Look up the callback for this message.
- MessageCallbackMap::const_iterator callback = message_callbacks_.find(message);
+ MessageCallbackMap::const_iterator callback(message_callbacks_.find(message));
if (callback == message_callbacks_.end())
return;
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 7a1dd02..5b9bd50 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -839,8 +839,8 @@
const std::string& data,
int32 status) {
webkit_glue::DomSerializerDelegate::PageSavingSerializationStatus flag =
- static_cast<webkit_glue::DomSerializerDelegate::PageSavingSerializationStatus>
- (status);
+ static_cast<webkit_glue::DomSerializerDelegate::
+ PageSavingSerializationStatus>(status);
// Check current state.
if (wait_state_ != HTML_DATA)
return;
diff --git a/chrome/browser/extensions/extension.cc b/chrome/browser/extensions/extension.cc
index 44635c5..d83f9d9 100644
--- a/chrome/browser/extensions/extension.cc
+++ b/chrome/browser/extensions/extension.cc
@@ -73,17 +73,17 @@
const size_t Extension::kIdSize = 20; // SHA1 (160 bits) == 20 bytes
-Extension::Extension(const Extension& rhs) :
- path_(rhs.path_),
- extension_url_(rhs.extension_url_),
- id_(rhs.id_),
- version_(new Version(*rhs.version_)),
- name_(rhs.name_),
- description_(rhs.description_),
- content_scripts_(rhs.content_scripts_),
- plugins_dir_(rhs.plugins_dir_),
- zip_hash_(rhs.zip_hash_),
- theme_paths_(rhs.theme_paths_) {
+Extension::Extension(const Extension& rhs)
+ : path_(rhs.path_),
+ extension_url_(rhs.extension_url_),
+ id_(rhs.id_),
+ version_(new Version(*rhs.version_)),
+ name_(rhs.name_),
+ description_(rhs.description_),
+ content_scripts_(rhs.content_scripts_),
+ plugins_dir_(rhs.plugins_dir_),
+ zip_hash_(rhs.zip_hash_),
+ theme_paths_(rhs.theme_paths_) {
}
const std::string Extension::VersionString() const {
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 416afe2..d2c6040 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -211,7 +211,8 @@
}
}
-void ExternalTabContainer::ReplaceContents(TabContents* source, TabContents* new_contents) {
+void ExternalTabContainer::ReplaceContents(TabContents* source,
+ TabContents* new_contents) {
}
void ExternalTabContainer::AddNewContents(TabContents* source,
diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc
index 5c34ef4..996e1199 100644
--- a/chrome/browser/history/download_database.cc
+++ b/chrome/browser/history/download_database.cc
@@ -55,7 +55,8 @@
SQLITE_OK;
}
-void DownloadDatabase::QueryDownloads(std::vector<DownloadCreateInfo>* results) {
+void DownloadDatabase::QueryDownloads(
+ std::vector<DownloadCreateInfo>* results) {
results->clear();
SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(),
@@ -156,7 +157,9 @@
time_t start_time = delete_begin.ToTimeT();
time_t end_time = delete_end.ToTimeT();
statement->bind_int64(0, start_time);
- statement->bind_int64(1, end_time ? end_time : std::numeric_limits<int64>::max());
+ statement->bind_int64(
+ 1,
+ end_time ? end_time : std::numeric_limits<int64>::max());
statement->bind_int(2, DownloadItem::COMPLETE);
statement->bind_int(3, DownloadItem::CANCELLED);
statement->step();
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 49707cf9..2fe36696 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -99,7 +99,8 @@
: thread_(new ChromeThread(ChromeThread::HISTORY)),
profile_(NULL),
backend_loaded_(false) {
- if (NotificationService::current()) { // Is NULL when running generate_profile.
+ // Is NULL when running generate_profile.
+ if (NotificationService::current()) {
NotificationService::current()->AddObserver(
this, NotificationType::HISTORY_URLS_DELETED,
Source<Profile>(profile_));
@@ -119,7 +120,8 @@
Cleanup();
// Unregister for notifications.
- if (NotificationService::current()) { // Is NULL when running generate_profile.
+ // Is NULL when running generate_profile.
+ if (NotificationService::current()) {
NotificationService::current()->RemoveObserver(
this, NotificationType::HISTORY_URLS_DELETED,
Source<Profile>(profile_));
diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc
index efcc317..93c6def 100644
--- a/chrome/browser/history/in_memory_history_backend.cc
+++ b/chrome/browser/history/in_memory_history_backend.cc
@@ -62,7 +62,9 @@
registered_for_notifications_ = true;
NotificationService* service = NotificationService::current();
service->AddObserver(this, NotificationType::HISTORY_URL_VISITED, source);
- service->AddObserver(this, NotificationType::HISTORY_TYPED_URLS_MODIFIED, source);
+ service->AddObserver(this,
+ NotificationType::HISTORY_TYPED_URLS_MODIFIED,
+ source);
service->AddObserver(this, NotificationType::HISTORY_URLS_DELETED, source);
}
diff --git a/chrome/browser/history/query_parser_unittest.cc b/chrome/browser/history/query_parser_unittest.cc
index 6d425e91..d36fb68 100644
--- a/chrome/browser/history/query_parser_unittest.cc
+++ b/chrome/browser/history/query_parser_unittest.cc
@@ -46,10 +46,14 @@
// Quoted substring parsing.
TEST_F(QueryParserTest, Quoted) {
- EXPECT_EQ(L"\"Quoted\"", QueryToString(L"\"Quoted\"")); // ASCII quotes
- EXPECT_EQ(L"\"miss end\"", QueryToString(L"\"miss end")); // Missing end quotes
- EXPECT_EQ(L"miss* beg*", QueryToString(L"miss beg\"")); // Missing begin quotes
- EXPECT_EQ(L"\"Many\" \"quotes\"", QueryToString(L"\"Many \"\"quotes")); // Weird formatting
+ // ASCII quotes
+ EXPECT_EQ(L"\"Quoted\"", QueryToString(L"\"Quoted\""));
+ // Missing end quotes
+ EXPECT_EQ(L"\"miss end\"", QueryToString(L"\"miss end"));
+ // Missing begin quotes
+ EXPECT_EQ(L"miss* beg*", QueryToString(L"miss beg\""));
+ // Weird formatting
+ EXPECT_EQ(L"\"Many\" \"quotes\"", QueryToString(L"\"Many \"\"quotes"));
}
// Apostrophes within words should be preserved, but otherwise stripped.
diff --git a/chrome/browser/history/text_database_unittest.cc b/chrome/browser/history/text_database_unittest.cc
index 4967f2f6..9da2b7c6 100644
--- a/chrome/browser/history/text_database_unittest.cc
+++ b/chrome/browser/history/text_database_unittest.cc
@@ -21,14 +21,16 @@
const char kURL1[] = "http://www.google.com/";
const int kTime1 = 1000;
const char kTitle1[] = "Google";
-const char kBody1[] = "COUNTTAG Web Images Maps News Shopping Gmail more My Account | "
+const char kBody1[] =
+ "COUNTTAG Web Images Maps News Shopping Gmail more My Account | "
"Sign out Advanced Search Preferences Language Tools Advertising Programs "
"- Business Solutions - About Google, 2008 Google";
const char kURL2[] = "http://images.google.com/";
const int kTime2 = 2000;
const char kTitle2[] = "Google Image Search";
-const char kBody2[] = "COUNTTAG Web Images Maps News Shopping Gmail more My Account | "
+const char kBody2[] =
+ "COUNTTAG Web Images Maps News Shopping Gmail more My Account | "
"Sign out Advanced Image Search Preferences The most comprehensive image "
"search on the web. Want to help improve Google Image Search? Try Google "
"Image Labeler. Advertising Programs - Business Solutions - About Google "
@@ -37,7 +39,8 @@
const char kURL3[] = "http://slashdot.org/";
const int kTime3 = 3000;
const char kTitle3[] = "Slashdot: News for nerds, stuff that matters";
-const char kBody3[] = "COUNTTAG Slashdot Log In Create Account Subscribe Firehose Why "
+const char kBody3[] =
+ "COUNTTAG Slashdot Log In Create Account Subscribe Firehose Why "
"Log In? Why Subscribe? Nickname Password Public Terminal Sections "
"Main Apple AskSlashdot Backslash Books Developers Games Hardware "
"Interviews IT Linux Mobile Politics Science YRO";
diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc
index 6db3b10..520906d 100644
--- a/chrome/browser/history/url_database.cc
+++ b/chrome/browser/history/url_database.cc
@@ -475,7 +475,8 @@
void URLDatabase::CreateSupplimentaryURLIndices() {
// Add a favicon index. This is useful when we delete urls.
- sqlite3_exec(GetDB(), "CREATE INDEX urls_favicon_id_INDEX ON urls (favicon_id)",
+ sqlite3_exec(GetDB(),
+ "CREATE INDEX urls_favicon_id_INDEX ON urls (favicon_id)",
NULL, NULL, NULL);
}
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc
index 9fd02ec..6a7497d 100644
--- a/chrome/browser/history/visit_database.cc
+++ b/chrome/browser/history/visit_database.cc
@@ -36,7 +36,8 @@
"from_visit INTEGER,"
"transition INTEGER DEFAULT 0 NOT NULL,"
"segment_id INTEGER,"
- "is_indexed BOOLEAN)", // True when we have indexed data for this visit.
+ // True when we have indexed data for this visit.
+ "is_indexed BOOLEAN)",
NULL, NULL, NULL) != SQLITE_OK)
return false;
} else if (!DoesSqliteColumnExist(GetDB(), "visits",
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index ba27f89..6a64dd2c 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -235,10 +235,10 @@
const NavigationEntry* last_committed_entry =
contents->controller()->GetLastCommittedEntry();
if ((last_committed_entry &&
- LowerCaseEqualsASCII(last_committed_entry->display_url().spec(),
+ LowerCaseEqualsASCII(last_committed_entry->display_url().spec(),
chrome::kAboutMemoryURL)) ||
(pending_entry &&
- LowerCaseEqualsASCII(pending_entry->display_url().spec(),
+ LowerCaseEqualsASCII(pending_entry->display_url().spec(),
chrome::kAboutMemoryURL)))
process.is_diagnostics = true;
}
diff --git a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
index 7dba1db3..2f059e5 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
+++ b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
@@ -212,9 +212,11 @@
void RunnableMethodTraits<RunnerBridge>::ReleaseCallee(RunnerBridge*) {}
template<>
-void RunnableMethodTraits<AsyncRequestRunner>::RetainCallee(AsyncRequestRunner*) {}
+void RunnableMethodTraits<AsyncRequestRunner>::RetainCallee(
+ AsyncRequestRunner*) {}
template<>
-void RunnableMethodTraits<AsyncRequestRunner>::ReleaseCallee(AsyncRequestRunner*) {}
+void RunnableMethodTraits<AsyncRequestRunner>::ReleaseCallee(
+ AsyncRequestRunner*) {}
// Issue three sequential requests -- each should succeed.
diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc
index b758d625..4ae9541a 100644
--- a/chrome/browser/net/url_fixer_upper_unittest.cc
+++ b/chrome/browser/net/url_fixer_upper_unittest.cc
@@ -243,16 +243,18 @@
FilePath dir;
FilePath original;
ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir));
- ASSERT_TRUE(MakeTempFile(dir,
- FilePath(FILE_PATH_LITERAL("url fixer upper existing file.txt")),
- &original));
+ ASSERT_TRUE(MakeTempFile(
+ dir,
+ FilePath(FILE_PATH_LITERAL("url fixer upper existing file.txt")),
+ &original));
// reference path
std::string golden = net::FilePathToFileURL(original).spec();
// c:\foo\bar.txt -> file:///c:/foo/bar.txt (basic)
#if defined(OS_WIN)
- std::string fixedup = URLFixerUpper::FixupURL(WideToUTF8(original.value()), "");
+ std::string fixedup = URLFixerUpper::FixupURL(WideToUTF8(original.value()),
+ "");
#elif defined(OS_POSIX)
std::string fixedup = URLFixerUpper::FixupURL(original.value(), "");
#endif
@@ -269,13 +271,16 @@
fixup_case file_cases[] = {
// File URLs go through GURL, which tries to escape intelligently.
- {"c:\\This%20is a non-existent file.txt", "", "file:///C:/This%2520is%20a%20non-existent%20file.txt"},
+ {"c:\\This%20is a non-existent file.txt", "",
+ "file:///C:/This%2520is%20a%20non-existent%20file.txt"},
// \\foo\bar.txt -> file://foo/bar.txt
// UNC paths, this file won't exist, but since there are no escapes, it
// should be returned just converted to a file: URL.
- {"\\\\SomeNonexistentHost\\foo\\bar.txt", "", "file://somenonexistenthost/foo/bar.txt"},
- {"//SomeNonexistentHost\\foo/bar.txt", "", "file://somenonexistenthost/foo/bar.txt"},
+ {"\\\\SomeNonexistentHost\\foo\\bar.txt", "",
+ "file://somenonexistenthost/foo/bar.txt"},
+ {"//SomeNonexistentHost\\foo/bar.txt", "",
+ "file://somenonexistenthost/foo/bar.txt"},
{"file:///C:/foo/bar", "", "file:///C:/foo/bar"},
// These are fixups we don't do, but could consider:
@@ -327,13 +332,15 @@
// create a filename we know doesn't exist and make sure it doesn't get
// fixed up to a file URL
- FilePath nonexistent_file(FILE_PATH_LITERAL("url_fixer_upper_nonexistent_file.txt"));
+ FilePath nonexistent_file(
+ FILE_PATH_LITERAL("url_fixer_upper_nonexistent_file.txt"));
fixedup = URLFixerUpper::FixupRelativeFile(dir, nonexistent_file);
EXPECT_NE(std::string("file:///"), fixedup.substr(0, 8));
EXPECT_FALSE(IsMatchingFileURL(fixedup, nonexistent_file));
// make a subdir to make sure relative paths with directories work, also
- // test spaces: "app_dir\url fixer-upper dir\url fixer-upper existing file.txt"
+ // test spaces:
+ // "app_dir\url fixer-upper dir\url fixer-upper existing file.txt"
FilePath sub_dir(FILE_PATH_LITERAL("url fixer-upper dir"));
FilePath sub_file(FILE_PATH_LITERAL("url fixer-upper existing file.txt"));
FilePath new_dir = dir.Append(sub_dir);
diff --git a/chrome/browser/page_state.cc b/chrome/browser/page_state.cc
index 827416c..c9e253e 100644
--- a/chrome/browser/page_state.cc
+++ b/chrome/browser/page_state.cc
@@ -62,7 +62,8 @@
state_->Set(key, new StringValue(value));
}
-bool PageState::GetProperty(const std::wstring& key, std::wstring* value) const {
+bool PageState::GetProperty(const std::wstring& key,
+ std::wstring* value) const {
if (state_->HasKey(key)) {
Value* v;
state_->Get(key, &v);
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index ae6e672..e47db138 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -181,7 +181,8 @@
}
}
-void PasswordManager::PasswordFormsSeen(const std::vector<PasswordForm>& forms) {
+void PasswordManager::PasswordFormsSeen(
+ const std::vector<PasswordForm>& forms) {
if (!web_contents_->profile() ||
!web_contents_->profile()->GetWebDataService(Profile::EXPLICIT_ACCESS))
return;
@@ -216,9 +217,10 @@
}
}
-void PasswordManager::Autofill(const PasswordForm& form_for_autofill,
- const PasswordFormMap& best_matches,
- const PasswordForm* const preferred_match) const {
+void PasswordManager::Autofill(
+ const PasswordForm& form_for_autofill,
+ const PasswordFormMap& best_matches,
+ const PasswordForm* const preferred_match) const {
DCHECK(web_contents_);
DCHECK(preferred_match);
switch (form_for_autofill.scheme) {
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 6221ada3..25761f8 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -145,9 +145,10 @@
DownloadCompletedHelper(false);
}
-void PluginDownloadUrlHelper::OnSSLCertificateError(URLRequest* request,
- int cert_error,
- net::X509Certificate* cert) {
+void PluginDownloadUrlHelper::OnSSLCertificateError(
+ URLRequest* request,
+ int cert_error,
+ net::X509Certificate* cert) {
URLRequest::Delegate::OnSSLCertificateError(request, cert_error, cert);
DownloadCompletedHelper(false);
}
diff --git a/chrome/browser/printing/print_job_manager.cc b/chrome/browser/printing/print_job_manager.cc
index c2ff3a8..4f70a30b 100644
--- a/chrome/browser/printing/print_job_manager.cc
+++ b/chrome/browser/printing/print_job_manager.cc
@@ -47,7 +47,8 @@
if (current_jobs_.size() == 0)
return;
{
- // Don't take a chance and copy the array since it can be modified in transit.
+ // Don't take a chance and copy the array since it can be modified in
+ // transit.
PrintJobs current_jobs(current_jobs_);
// Wait for every jobs to finish.
for (size_t i = 0; i < current_jobs.size(); ++i) {
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 8549f25..10f9b07 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -205,7 +205,8 @@
PrintingLayoutTest() {
emf_path_ = browser_directory_;
file_util::AppendToPath(&emf_path_, L"emf_dumps");
- launch_arguments_.AppendSwitchWithValue(L"debug-print", L'"' + emf_path_ + L'"');
+ launch_arguments_.AppendSwitchWithValue(L"debug-print",
+ L'"' + emf_path_ + L'"');
show_window_ = true;
}
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 83a117d8..2610dba 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -758,8 +758,9 @@
}
// Static. This function can be called from the IO Thread or from the UI thread.
-void BrowserRenderProcessHost::BadMessageTerminateProcess(uint16 msg_type,
- base::ProcessHandle process) {
+void BrowserRenderProcessHost::BadMessageTerminateProcess(
+ uint16 msg_type,
+ base::ProcessHandle process) {
LOG(ERROR) << "bad message " << msg_type << " terminating renderer.";
if (BrowserRenderProcessHost::run_renderer_in_process()) {
// In single process mode it is better if we don't suicide but just crash.
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 6951e3d..3e45ba5 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -449,8 +449,8 @@
process()->ReceivedBadMessage(ViewHostMsg_PaintRect__ID);
} else {
// Paint the backing store. This will update it with the renderer-supplied
- // bits. The view will read out of the backing store later to actually draw
- // to the screen.
+ // bits. The view will read out of the backing store later to actually
+ // draw to the screen.
PaintBackingStoreRect(dib, params.bitmap_rect, params.view_size);
}
}
diff --git a/chrome/browser/renderer_host/renderer_security_policy.cc b/chrome/browser/renderer_host/renderer_security_policy.cc
index e33b0d1..d79dced0 100644
--- a/chrome/browser/renderer_host/renderer_security_policy.cc
+++ b/chrome/browser/renderer_host/renderer_security_policy.cc
@@ -134,7 +134,8 @@
void RendererSecurityPolicy::RegisterPseudoScheme(const std::string& scheme) {
AutoLock lock(lock_);
DCHECK(pseudo_schemes_.count(scheme) == 0) << "Add schemes at most once.";
- DCHECK(web_safe_schemes_.count(scheme) == 0) << "Psuedo implies not web-safe.";
+ DCHECK(web_safe_schemes_.count(scheme) == 0) <<
+ "Psuedo implies not web-safe.";
pseudo_schemes_.insert(scheme);
}
@@ -159,8 +160,8 @@
if (url.SchemeIs(chrome::kViewSourceScheme)) {
// URLs with the view-source scheme typically look like:
// view-source:http://www.google.com/a
- // In order to request these URLs, the renderer needs to be able to request
- // the embedded URL.
+ // In order to request these URLs, the renderer needs to be able to
+ // request the embedded URL.
GrantRequestURL(renderer_id, GURL(url.path()));
}
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index a64463f..0caf6ab 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -153,8 +153,9 @@
public:
virtual void OnRequestStarted(ResourceDispatcherHost* resource_dispatcher,
URLRequest* request) = 0;
- virtual void OnResponseCompleted(ResourceDispatcherHost* resource_dispatcher,
- URLRequest* request) = 0;
+ virtual void OnResponseCompleted(
+ ResourceDispatcherHost* resource_dispatcher,
+ URLRequest* request) = 0;
virtual void OnReceivedRedirect(ResourceDispatcherHost* resource_dispatcher,
URLRequest* request,
const GURL& new_url) = 0;
@@ -310,7 +311,8 @@
return r;
}
- static const ExtraRequestInfo* ExtraInfoForRequest(const URLRequest* request) {
+ static const ExtraRequestInfo* ExtraInfoForRequest(
+ const URLRequest* request) {
const ExtraRequestInfo* r =
static_cast<const ExtraRequestInfo*>(request->user_data());
DLOG_IF(WARNING, !r) << "Request doesn't seem to have our data";
diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc
index 0781e45..2d30fc3 100644
--- a/chrome/browser/safe_browsing/chunk_range.cc
+++ b/chrome/browser/safe_browsing/chunk_range.cc
@@ -73,7 +73,8 @@
std::vector<ChunkRange>* ranges) {
DCHECK(ranges);
- // Crack the string into chunk parts, then crack each part looking for a range.
+ // Crack the string into chunk parts, then crack each part looking for a
+ // range.
std::vector<std::string> chunk_parts;
SplitString(input, ',', &chunk_parts);
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index f800ce1..327297ab 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -30,19 +30,23 @@
// Update URL for querying about the latest set of chunk updates.
static const char* const kSbUpdateUrl =
- "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=%s&appver=%s&pver=2.2";
+ "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=%s"
+ "&appver=%s&pver=2.2";
// GetHash request URL for retrieving full hashes.
static const char* const kSbGetHashUrl =
- "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=%s&appver=%s&pver=2.2";
+ "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=%s"
+ "&appver=%s&pver=2.2";
// New MAC client key requests URL.
static const char* const kSbNewKeyUrl =
- "https://sb-ssl.google.com/safebrowsing/newkey?client=%s&appver=%s&pver=2.2";
+ "https://sb-ssl.google.com/safebrowsing/newkey?client=%s&appver=%s"
+ "&pver=2.2";
// URL for reporting malware pages.
static const char* const kSbMalwareReportUrl =
- "http://safebrowsing.clients.google.com/safebrowsing/report?evts=malblhit&evtd=%s&evtr=%s&evhr=%s&client=%s&appver=%s";
+ "http://safebrowsing.clients.google.com/safebrowsing/report?evts=malblhit"
+ "&evtd=%s&evtr=%s&evhr=%s&client=%s&appver=%s";
#if defined(GOOGLE_CHROME_BUILD)
static const char* const kSbClientName = "googlechrome";
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 3023a2c..9489b0f 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -45,7 +45,8 @@
// Testing friends:
FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestBackOffTimes);
FRIEND_TEST(SafeBrowsingProtocolManagerTest, TestChunkStrings);
- FRIEND_TEST(SafeBrowsingProtocolManagerTest, DISABLED_TestGetHashBackOffTimes);
+ FRIEND_TEST(SafeBrowsingProtocolManagerTest,
+ DISABLED_TestGetHashBackOffTimes);
public:
SafeBrowsingProtocolManager(SafeBrowsingService* sb_service,
diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
index 25af2b30..57514ae8 100644
--- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
@@ -76,7 +76,8 @@
phish.adds = "";
phish.subs = "16,32,64-96";
EXPECT_EQ(pm.FormatList(phish, false), "goog-phish-shavar;s:16,32,64-96\n");
- EXPECT_EQ(pm.FormatList(phish, true), "goog-phish-shavar;s:16,32,64-96:mac\n");
+ EXPECT_EQ(pm.FormatList(phish, true),
+ "goog-phish-shavar;s:16,32,64-96:mac\n");
// No chunks of either type.
phish.adds = "";
diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc
index 0359a1c0..ce8474c6 100644
--- a/chrome/browser/safe_browsing/protocol_parser.cc
+++ b/chrome/browser/safe_browsing/protocol_parser.cc
@@ -296,11 +296,13 @@
if (cmd_parts[0] == "a") {
chunks->back().is_add = true;
- if (!ParseAddChunk(chunk_data, chunk_len, hash_len, &chunks->back().hosts))
+ if (!ParseAddChunk(chunk_data, chunk_len, hash_len,
+ &chunks->back().hosts))
return false; // Parse error.
} else if (cmd_parts[0] == "s") {
chunks->back().is_add = false;
- if (!ParseSubChunk(chunk_data, chunk_len, hash_len, &chunks->back().hosts))
+ if (!ParseSubChunk(chunk_data, chunk_len, hash_len,
+ &chunks->back().hosts))
return false; // Parse error.
} else {
NOTREACHED();
@@ -354,7 +356,8 @@
hosts->push_back(chunk_host);
}
- if (!ReadPrefixes(&chunk_data, &remaining, entry, prefix_count, index_start))
+ if (!ReadPrefixes(&chunk_data, &remaining, entry, prefix_count,
+ index_start))
return false;
}
diff --git a/chrome/browser/safe_browsing/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
index bc371185..47ea95d 100644
--- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
@@ -699,19 +699,35 @@
"m:XIU0LiQhAPJq6dynXwHbygjS5tw=\n"
"n:1895\n"
"i:goog-phish-shavar\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6501-6505:6501-6505,pcY6iVeT9-CBQ3fdAF0rpnKjR1Y=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6506-6510:6506-6510,SDBrYC3rX3KEPe72LOypnP6QYac=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6511-6520:6511-6520,9UQo-e7OkcsXT2wFWTAhOuWOsUs=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6521-6560:6521-6560,qVNw6JIpR1q6PIXST7J4LJ9n3Zg=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6561-6720:6561-6720,7OiJvCbiwvpzPITW-hQohY5NHuc=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6721-6880:6721-6880,oBS3svhoi9deIa0sWZ_gnD0ujj8=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6881-7040:6881-7040,a0r8Xit4VvH39xgyQHZTPczKBIE=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_7041-7200:7041-7163,q538LChutGknBw55s6kcE2wTcvU=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8001-8160:8001-8024,8026-8045,8048-8049,8051-8134,8136-8152,8155-8160,j6XXAEWnjYk9tVVLBSdQvIEq2Wg=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8161-8320:8161-8215,8217-8222,8224-8320,YaNfiqdQOt-uLCLWVLj46AZpAjQ=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8321-8480:8321-8391,8393-8399,8402,8404-8419,8421-8425,8427,8431-8433,8435-8439,8441-8443,8445-8446,8448-8480,ALj31GQMwGiIeU3bM2ZYKITfU-U=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8481-8640:8481-8500,8502-8508,8510-8511,8513-8517,8519-8525,8527-8531,8533,8536-8539,8541-8576,8578-8638,8640,TlQYRmS_kZ5PBAUIUyNQDq0Jprs=\n"
- "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8641-8800:8641-8689,8691-8731,8733-8786,x1Qf7hdNrO8b6yym03ZzNydDS1o=\n";
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6501-6505:6501-6505,"
+ "pcY6iVeT9-CBQ3fdAF0rpnKjR1Y=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6506-6510:6506-6510,"
+ "SDBrYC3rX3KEPe72LOypnP6QYac=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6511-6520:6511-6520,"
+ "9UQo-e7OkcsXT2wFWTAhOuWOsUs=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6521-6560:6521-6560,"
+ "qVNw6JIpR1q6PIXST7J4LJ9n3Zg=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6561-6720:6561-6720,"
+ "7OiJvCbiwvpzPITW-hQohY5NHuc=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6721-6880:6721-6880,"
+ "oBS3svhoi9deIa0sWZ_gnD0ujj8=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_6881-7040:6881-7040,"
+ "a0r8Xit4VvH39xgyQHZTPczKBIE=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_7041-7200:7041-7163,"
+ "q538LChutGknBw55s6kcE2wTcvU=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8001-8160:8001-8024,"
+ "8026-8045,8048-8049,8051-8134,8136-8152,8155-8160,"
+ "j6XXAEWnjYk9tVVLBSdQvIEq2Wg=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8161-8320:8161-8215,"
+ "8217-8222,8224-8320,YaNfiqdQOt-uLCLWVLj46AZpAjQ=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8321-8480:8321-8391,"
+ "8393-8399,8402,8404-8419,8421-8425,8427,8431-8433,8435-8439,8441-8443,"
+ "8445-8446,8448-8480,ALj31GQMwGiIeU3bM2ZYKITfU-U=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8481-8640:8481-8500,"
+ "8502-8508,8510-8511,8513-8517,8519-8525,8527-8531,8533,8536-8539,"
+ "8541-8576,8578-8638,8640,TlQYRmS_kZ5PBAUIUyNQDq0Jprs=\n"
+ "u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_8641-8800:8641-8689,"
+ "8691-8731,8733-8786,x1Qf7hdNrO8b6yym03ZzNydDS1o=\n";
bool re_key = false;
bool reset = false;
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 2eafe9a1..c30a07f8 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -38,7 +38,8 @@
"http://www.google.com/safebrowsing/report_error/";
static const wchar_t* const kSbDiagnosticHtml =
- L"<a href=\"\" onClick=\"sendCommand('showDiagnostic'); return false;\" onMouseDown=\"return false;\">%ls</a>";
+ L"<a href=\"\" onClick=\"sendCommand('showDiagnostic'); return false;\" "
+ L"onMouseDown=\"return false;\">%ls</a>";
// The commands returned by the page when the user performs an action.
static const char* const kShowDiagnosticCommand = "showDiagnostic";
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
index a05933d..8e7566a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
@@ -538,7 +538,8 @@
} else {
for (int i = 0; i < count; i++) {
SBPrefix prefix = entry->PrefixAt(i);
- encoded_add = EncodeChunkId(entry->ChunkIdAtPrefix(i), entry->list_id());
+ encoded_add = EncodeChunkId(entry->ChunkIdAtPrefix(i),
+ entry->list_id());
InsertSubPrefix(prefix, encoded, encoded_add);
}
}
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 67edb12..ea19736 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -495,7 +495,8 @@
SBEntry* new_sub_entry = const_cast<SBEntry*>(entry);
scoped_array<char> data;
- if (entry->IsSub() && entry->list_id() == list_id && entry->prefix_count()) {
+ if (entry->IsSub() && entry->list_id() == list_id &&
+ entry->prefix_count()) {
// Make a copy of the entry so that we can modify it.
data.reset(new char[entry->Size()]);
new_sub_entry = reinterpret_cast<SBEntry*>(data.get());
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index 5bdf73f..2c673d4 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -123,7 +123,8 @@
// Removes all auto-generated keywords that were created in the specified
// range.
- void RemoveAutoGeneratedBetween(base::Time created_after, base::Time created_before);
+ void RemoveAutoGeneratedBetween(base::Time created_after,
+ base::Time created_before);
// Replaces existing_turl with new_turl. new_turl is given the same ID as
// existing_turl. If existing_turl was the default, new_turl is made the
diff --git a/chrome/browser/session_startup_pref.h b/chrome/browser/session_startup_pref.h
index 8a405796..fac31602 100644
--- a/chrome/browser/session_startup_pref.h
+++ b/chrome/browser/session_startup_pref.h
@@ -31,7 +31,8 @@
// What should happen on startup for the specified profile.
static void SetStartupPref(Profile* profile, const SessionStartupPref& pref);
- static void SetStartupPref(PrefService* prefs, const SessionStartupPref& pref);
+ static void SetStartupPref(PrefService* prefs,
+ const SessionStartupPref& pref);
static SessionStartupPref GetStartupPref(Profile* profile);
static SessionStartupPref GetStartupPref(PrefService* prefs);
diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc
index 5400c17..f26ab45e 100644
--- a/chrome/browser/sessions/session_backend_unittest.cc
+++ b/chrome/browser/sessions/session_backend_unittest.cc
@@ -136,7 +136,8 @@
new SessionBackend(BaseSessionService::SESSION_RESTORE, path_));
std::vector<SessionCommand*> commands;
commands.push_back(CreateCommandFromData(data[0]));
- const SessionCommand::size_type big_size = SessionBackend::kFileReadBufferSize + 100;
+ const SessionCommand::size_type big_size =
+ SessionBackend::kFileReadBufferSize + 100;
const SessionCommand::id_type big_id = 50;
SessionCommand* big_command = new SessionCommand(big_id, big_size);
reinterpret_cast<char*>(big_command->contents())[0] = 'a';
diff --git a/chrome/browser/spellchecker.cc b/chrome/browser/spellchecker.cc
index 88261d48d..78a46f5 100644
--- a/chrome/browser/spellchecker.cc
+++ b/chrome/browser/spellchecker.cc
@@ -385,7 +385,8 @@
file_loop_(NULL),
url_request_context_(request_context),
dic_is_downloading_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(dic_download_state_changer_factory_(this)) {
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ dic_download_state_changer_factory_(this)) {
// Remember UI loop to later use this as a proxy to get IO loop.
ui_loop_ = MessageLoop::current();
diff --git a/chrome/browser/ssl/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc
index ad5581b..7ba3b61 100644
--- a/chrome/browser/ssl/ssl_uitest.cc
+++ b/chrome/browser/ssl/ssl_uitest.cc
@@ -87,8 +87,10 @@
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
scoped_ptr<TabProxy> tab(GetActiveTabProxy());
- NavigateTab(tab.get(),
- http_server->TestServerPageW(L"files/ssl/page_with_unsafe_contents.html"));
+ NavigateTab(
+ tab.get(),
+ http_server->TestServerPageW(
+ L"files/ssl/page_with_unsafe_contents.html"));
SecurityStyle security_style;
int cert_status;
@@ -223,8 +225,10 @@
// Load a page with mixed-content, the default behavior is to show the mixed
// content.
scoped_ptr<TabProxy> tab(GetActiveTabProxy());
- NavigateTab(tab.get(),
- https_server->TestServerPageW(L"files/ssl/page_with_mixed_contents.html"));
+ NavigateTab(
+ tab.get(),
+ https_server->TestServerPageW(
+ L"files/ssl/page_with_mixed_contents.html"));
NavigationEntry::PageType page_type;
EXPECT_TRUE(tab->GetPageType(&page_type));
EXPECT_EQ(NavigationEntry::NORMAL_PAGE, page_type);
@@ -488,8 +492,9 @@
TEST_F(SSLUITest, TestRefNavigation) {
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
scoped_ptr<TabProxy> tab(GetActiveTabProxy());
- NavigateTab(tab.get(),
- bad_https_server->TestServerPageW(L"files/ssl/page_with_refs.html"));
+ NavigateTab(
+ tab.get(),
+ bad_https_server->TestServerPageW(L"files/ssl/page_with_refs.html"));
NavigationEntry::PageType page_type;
EXPECT_TRUE(tab->GetPageType(&page_type));
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index 857068f..a56618b 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -363,8 +363,9 @@
// Notify the tab we are not loading so the throbber is stopped. It also
// causes a NOTIFY_LOAD_STOP notification, that the AutomationProvider (used
- // by the UI tests) expects to consider a navigation as complete. Without this,
- // navigating in a UI test to a URL that triggers an interstitial would hang.
+ // by the UI tests) expects to consider a navigation as complete. Without
+ // this, navigating in a UI test to a URL that triggers an interstitial would
+ // hang.
tab_->SetIsLoading(false, NULL);
#else
// TODO(port): we need RenderViewHost.
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index a35f454e..263a5ce 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -475,7 +475,7 @@
type = active->type();
else
type = TabContents::TypeForURL(&real_url);
-
+
NavigationEntry* entry = new NavigationEntry(type, NULL, -1, real_url,
referrer,
string16(), transition);
diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.cc b/chrome/browser/tab_contents/render_view_context_menu_controller.cc
index 88ca046..19c68d4 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_controller.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu_controller.cc
@@ -303,8 +303,9 @@
case IDS_CONTENT_CONTEXT_SAVELINKAS: {
const GURL& referrer =
params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
- const GURL& url = id == IDS_CONTENT_CONTEXT_SAVELINKAS ? params_.link_url :
- params_.image_url;
+ const GURL& url =
+ (id == IDS_CONTENT_CONTEXT_SAVELINKAS ? params_.link_url :
+ params_.image_url);
DownloadManager* dlm =
source_web_contents_->profile()->GetDownloadManager();
dlm->DownloadUrl(url, referrer, source_web_contents_);
diff --git a/chrome/browser/tab_contents/site_instance.cc b/chrome/browser/tab_contents/site_instance.cc
index a2a051f..cdbef80 100644
--- a/chrome/browser/tab_contents/site_instance.cc
+++ b/chrome/browser/tab_contents/site_instance.cc
@@ -135,8 +135,8 @@
GURL about_hang = GURL("about:hang");
GURL about_shorthang = GURL("about:shorthang");
if (url1 == about_crash || url2 == about_crash ||
- url1 == about_hang || url2 == about_hang ||
- url1 == about_shorthang || url2 == about_shorthang)
+ url1 == about_hang || url2 == about_hang ||
+ url1 == about_shorthang || url2 == about_shorthang)
return true;
// If either URL is invalid, they aren't part of the same site.
diff --git a/chrome/browser/tab_contents/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc
index fa8787e..efd17d81 100644
--- a/chrome/browser/tab_contents/tab_contents_factory.cc
+++ b/chrome/browser/tab_contents/tab_contents_factory.cc
@@ -45,7 +45,8 @@
switch (type) {
case TAB_CONTENTS_WEB:
- contents = new WebContents(profile, instance, NULL, MSG_ROUTING_NONE, NULL);
+ contents = new WebContents(profile, instance, NULL, MSG_ROUTING_NONE,
+ NULL);
break;
// TODO(port): remove this platform define, either by porting the tab contents
// types or removing them completely.
diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc
index 80526365..0581b63 100644
--- a/chrome/browser/tabs/tab_strip_model_order_controller.cc
+++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc
@@ -34,8 +34,8 @@
if (transition == PageTransition::LINK && tabstrip_->selected_index() != -1) {
if (foreground) {
- // If the page was opened in the foreground by a link click in another tab,
- // insert it adjacent to the tab that opened that link.
+ // If the page was opened in the foreground by a link click in another
+ // tab, insert it adjacent to the tab that opened that link.
// TODO(beng): (http://b/1085481) may want to open right of all locked
// tabs?
return tabstrip_->selected_index() + 1;
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 323fd254..3778a93 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -791,7 +791,8 @@
InsertTabContentses(&tabstrip, contents1, contents2, contents3);
EXPECT_EQ(5, tabstrip.count());
- tabstrip.ExecuteContextMenuCommand(0, TabStripModel::CommandCloseTabsOpenedBy);
+ tabstrip.ExecuteContextMenuCommand(0,
+ TabStripModel::CommandCloseTabsOpenedBy);
EXPECT_EQ(2, tabstrip.count());
EXPECT_EQ(dummy_contents, tabstrip.GetTabContentsAt(1));
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 4abc5887..d1a92dc 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -232,7 +232,8 @@
break;
case WM_NOTIFY: {
NMLISTVIEW* info = reinterpret_cast<NM_LISTVIEW*>(lparam);
- if ((wparam == IDC_View || wparam == IDC_ViewHost || wparam == IDC_Plugin ||
+ if ((wparam == IDC_View || wparam == IDC_ViewHost ||
+ wparam == IDC_Plugin ||
wparam == IDC_PluginHost || wparam == IDC_NPObject ||
wparam == IDC_PluginProcess || wparam == IDC_PluginProcessHost) &&
info->hdr.code == LVN_ITEMCHANGED) {
diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 1f25ec8..9631a3ec 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -324,7 +324,8 @@
static const int text_column_set = 2;
column_set = layout->AddColumnSet(text_column_set);
- column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 100.0f,
+ column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
+ 100.0f,
views::GridLayout::FIXED, 0, 0);
layout->StartRow(0, first_column_set);
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 55e8d5b..6c19083 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -67,7 +67,8 @@
GlassBrowserWindowResources* GlassBrowserFrameView::resources_ = NULL;
SkBitmap* GlassBrowserFrameView::distributor_logo_ = NULL;
-HICON GlassBrowserFrameView::throbber_icons_[GlassBrowserFrameView::kThrobberIconCount];
+HICON GlassBrowserFrameView::throbber_icons_[
+ GlassBrowserFrameView::kThrobberIconCount];
namespace {
// There are 3 px of client edge drawn inside the outer frame borders.
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 76281f3..788bd1a 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -156,7 +156,8 @@
return true;
}
-void HtmlDialogView::ToolbarSizeChanged(TabContents* source, bool is_animating) {
+void HtmlDialogView::ToolbarSizeChanged(TabContents* source,
+ bool is_animating) {
Layout();
}
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 5f9a5b8..9439f7d0 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -233,8 +233,9 @@
static int kDefaultWindowWidthChars = 60;
static int kDefaultWindowHeightLines = 3;
-AddLanguageWindowView::AddLanguageWindowView(LanguagesPageView* language_delegate,
- Profile* profile)
+AddLanguageWindowView::AddLanguageWindowView(
+ LanguagesPageView* language_delegate,
+ Profile* profile)
: profile_(profile->GetOriginalProfile()),
language_delegate_(language_delegate),
accept_language_combobox_(NULL) {
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 80ed2944..6ff1d14 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -40,7 +40,8 @@
rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD);
title_label_->SetFont(title_font);
SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault(
- gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, COLOR_WINDOWTEXT);
+ gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
+ COLOR_WINDOWTEXT);
title_label_->SetColor(title_color);
title_label_->SetMultiLine(true);
title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index e5e7cad..dbc8d4bf 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -960,8 +960,8 @@
bool destroy_now = true;
if (type != TAB_DESTROYED) {
// We only finish up the drag if we were actually dragging. If we never
- // constructed a view, the user just clicked and released and didn't move the
- // mouse enough to trigger a drag.
+ // constructed a view, the user just clicked and released and didn't move
+ // the mouse enough to trigger a drag.
if (view_.get()) {
RestoreFocus();
if (type == CANCELED) {
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index ba18603e..d67d6d3 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -13,8 +13,10 @@
#include "skia/ext/bitmap_platform_device_win.h"
#include "SkGradientShader.h"
-void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2) {
- DCHECK(c1 && c2) << "ThemeHelpers::GetRebarGradientColors - c1 or c2 is NULL!";
+void GetRebarGradientColors(int width, int x1, int x2,
+ SkColor* c1, SkColor* c2) {
+ DCHECK(c1 && c2) <<
+ "ThemeHelpers::GetRebarGradientColors - c1 or c2 is NULL!";
// To get the colors we need, we draw a horizontal gradient using
// DrawThemeBackground, then extract the pixel values from and return
@@ -63,7 +65,8 @@
// The | in the following operations forces the alpha to 0xFF. This is
// needed as windows sets the alpha to 0 when it renders.
skia::BitmapPlatformDeviceWin& device =
- static_cast<skia::BitmapPlatformDeviceWin&>(canvas.getTopPlatformDevice());
+ static_cast<skia::BitmapPlatformDeviceWin&>(
+ canvas.getTopPlatformDevice());
*c1 = 0xFF000000 | device.getColorAt(x1, 0);
*c2 = 0xFF000000 | device.getColorAt(x2, 0);
}
diff --git a/chrome/browser/views/theme_helpers.h b/chrome/browser/views/theme_helpers.h
index 645aa977..979cf86 100644
--- a/chrome/browser/views/theme_helpers.h
+++ b/chrome/browser/views/theme_helpers.h
@@ -19,7 +19,8 @@
// The width parameter is the width of horizontal gradient that will be
// created to calculate the two colors. x1 and x2 are the two pixel positions
// along the X axis.
-void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2);
+void GetRebarGradientColors(int width, int x1, int x2,
+ SkColor* c1, SkColor* c2);
// Gets the color used to draw dark (inset beveled) lines.
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index b8a7e8c..f98c4013 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -631,7 +631,8 @@
" password_element, password_value, submit_element, "
" signon_realm, ssl_valid, preferred, date_created, "
" blacklisted_by_user, scheme) "
- "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") != SQLITE_OK) {
+ "VALUES "
+ "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") != SQLITE_OK) {
NOTREACHED() << "Statement prepare failed";
return false;
}
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
index 39e76619..7839f44 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/common/child_process_host.cc
@@ -119,7 +119,8 @@
: host_(host) {
}
-void ChildProcessHost::ListenerHook::OnMessageReceived(const IPC::Message& msg) {
+void ChildProcessHost::ListenerHook::OnMessageReceived(
+ const IPC::Message& msg) {
#ifdef IPC_MESSAGE_LOG_ENABLED
IPC::Logging* logger = IPC::Logging::current();
if (msg.type() == IPC_LOGGING_ID) {
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index ff73a7f..7a6e39c5 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -24,7 +24,8 @@
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
webkit_glue::SetUserAgent(WideToUTF8(
- CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kUserAgent)));
+ CommandLine::ForCurrentProcess()->GetSwitchValue(
+ switches::kUserAgent)));
}
}
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9b3f8ced..22ab129 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -213,7 +213,8 @@
return false;
}
- if (create_dir && !file_util::PathExists(cur) && !file_util::CreateDirectory(cur))
+ if (create_dir && !file_util::PathExists(cur) &&
+ !file_util::CreateDirectory(cur))
return false;
*result = cur;
diff --git a/chrome/common/chrome_plugin_api.h b/chrome/common/chrome_plugin_api.h
index 039dac8..4eae375 100644
--- a/chrome/common/chrome_plugin_api.h
+++ b/chrome/common/chrome_plugin_api.h
@@ -218,9 +218,9 @@
// Asks the browser to show an HTML dialog to the user. The dialog contents
// should be loaded from the given URL. The 'json_arguments' is a JSON string
// that the dialog can fetch using Chrome's JavaScript DOM bindings. This call
-// will block until the dialog is closed. On success, 'json_retval' will contain
-// the JSON string sent back by the dialog (using Chrome's JavaScript DOM
-// bindings), and CPERR_SUCCESS is returned. 'json_retval' should be freed
+// will block until the dialog is closed. On success, 'json_retval' will
+// contain the JSON string sent back by the dialog (using Chrome's JavaScript
+// DOM bindings), and CPERR_SUCCESS is returned. 'json_retval' should be freed
// using CPB_Free when done.
typedef CPError (STDCALL *CPB_ShowHtmlDialogModalFunc)(
CPID id, CPBrowsingContext context, const char* url, int width, int height,
@@ -405,7 +405,8 @@
// Informs the plugin of raw data having been sent from another process.
typedef void (STDCALL *CPP_OnSyncMessageFunc)(void *data, uint32 data_len,
- void **retval, uint32 *retval_len);
+ void **retval,
+ uint32 *retval_len);
// Informs the plugin that the file dialog has completed, and contains the
// results.
diff --git a/chrome/common/classfactory.cc b/chrome/common/classfactory.cc
index feaa9e63..ba32c15 100644
--- a/chrome/common/classfactory.cc
+++ b/chrome/common/classfactory.cc
@@ -21,7 +21,8 @@
LONG GenericClassFactory::object_count_ = 0;
-STDMETHODIMP GenericClassFactory::QueryInterface(REFIID riid, LPVOID* ppobject) {
+STDMETHODIMP GenericClassFactory::QueryInterface(REFIID riid,
+ LPVOID* ppobject) {
*ppobject = NULL;
if (IsEqualIID(riid, IID_IUnknown) ||
diff --git a/chrome/common/classfactory.h b/chrome/common/classfactory.h
index bd42cb83..291ce00 100644
--- a/chrome/common/classfactory.h
+++ b/chrome/common/classfactory.h
@@ -25,7 +25,8 @@
STDMETHOD_(ULONG, Release)();
//IClassFactory methods
- STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID* ppvObject) = 0;
+ STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid,
+ LPVOID* ppvObject) = 0;
STDMETHOD(LockServer)(BOOL fLock);
// generally handy for DllUnloadNow -- count of existing descendant objects
@@ -49,7 +50,8 @@
template <class T>
-STDMETHODIMP OneClassFactory<T>::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void** result) {
+STDMETHODIMP OneClassFactory<T>::CreateInstance(LPUNKNOWN pUnkOuter,
+ REFIID riid, void** result) {
*result = NULL;
if(pUnkOuter != NULL)
diff --git a/chrome/common/ipc_channel_win.cc b/chrome/common/ipc_channel_win.cc
index 54818b5..38e442a8 100644
--- a/chrome/common/ipc_channel_win.cc
+++ b/chrome/common/ipc_channel_win.cc
@@ -106,8 +106,8 @@
return true;
}
-const std::wstring Channel::ChannelImpl::PipeName(const std::wstring& channel_id)
- const {
+const std::wstring Channel::ChannelImpl::PipeName(
+ const std::wstring& channel_id) const {
std::wostringstream ss;
// XXX(darin): get application name from somewhere else
ss << L"\\\\.\\pipe\\chrome." << channel_id;
diff --git a/chrome/common/ipc_message_macros.h b/chrome/common/ipc_message_macros.h
index 18b6e9f6..8947e8e 100644
--- a/chrome/common/ipc_message_macros.h
+++ b/chrome/common/ipc_message_macros.h
@@ -18,8 +18,8 @@
// "Sync" messages are just synchronous calls, the Send() call doesn't return
// until a reply comes back. Input parameters are first (const TYPE&), and
// To declare a sync message, use the IPC_SYNC_ macros. The numbers at the
-// end show how many input/output parameters there are (i.e. 1_2 is 1 in, 2 out).
-// The caller does a Send([route id, ], in1, &out1, &out2).
+// end show how many input/output parameters there are (i.e. 1_2 is 1 in, 2
+// out). The caller does a Send([route id, ], in1, &out1, &out2).
// The receiver's handler function will be
// void OnSyncMessageName(const type1& in1, type2* out1, type3* out2)
//
@@ -30,7 +30,8 @@
// type, stash the message, and when it has the data it can Send the message.
//
// Use the IPC_MESSAGE_HANDLER_DELAY_REPLY macro instead of IPC_MESSAGE_HANDLER
-// IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_SyncMessageName, OnSyncMessageName)
+// IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_SyncMessageName,
+// OnSyncMessageName)
//
// The handler function will look like:
// void OnSyncMessageName(const type1& in1, IPC::Message* reply_msg);
@@ -140,11 +141,11 @@
// 16 channel types (currently using 8) and 4K messages per type. Should
// really make type be 32 bits, but then we break automation with older Chrome
// builds..
-
+// Do label##PreStart so that automation messages keep the same id as before.
#define IPC_BEGIN_MESSAGES(label) \
enum label##MsgType { \
label##Start = label##MsgStart << 12, \
- label##PreStart = (label##MsgStart << 12) - 1, // Do this so that automation messages keep the same id as before
+ label##PreStart = (label##MsgStart << 12) - 1,
#define IPC_END_MESSAGES(label) \
label##End \
diff --git a/chrome/common/ipc_sync_channel.cc b/chrome/common/ipc_sync_channel.cc
index 4abef3a4..307c1e6 100644
--- a/chrome/common/ipc_sync_channel.cc
+++ b/chrome/common/ipc_sync_channel.cc
@@ -388,7 +388,8 @@
return false;
}
- DCHECK(sync_messages_with_no_timeout_allowed_ || timeout_ms != base::kNoTimeout);
+ DCHECK(sync_messages_with_no_timeout_allowed_ ||
+ timeout_ms != base::kNoTimeout);
SyncMessage* sync_msg = static_cast<SyncMessage*>(message);
context->Push(sync_msg);
int message_id = SyncMessage::GetMessageId(*sync_msg);
diff --git a/chrome/common/ipc_sync_channel.h b/chrome/common/ipc_sync_channel.h
index 725fb332..6c3ce548 100644
--- a/chrome/common/ipc_sync_channel.h
+++ b/chrome/common/ipc_sync_channel.h
@@ -79,8 +79,8 @@
void DispatchMessages();
// Checks if the given message is blocking the listener thread because of a
- // synchronous send. If it is, the thread is unblocked and true is returned.
- // Otherwise the function returns false.
+ // synchronous send. If it is, the thread is unblocked and true is
+ // returned. Otherwise the function returns false.
bool TryToUnblockListener(const Message* msg);
// Called on the IPC thread when a sync send that runs a nested message loop
@@ -107,8 +107,8 @@
// WaitableEventWatcher::Delegate implementation.
virtual void OnWaitableEventSignaled(base::WaitableEvent* arg);
- // When sending a synchronous message, this structure contains an object that
- // knows how to deserialize the response.
+ // When sending a synchronous message, this structure contains an object
+ // that knows how to deserialize the response.
struct PendingSyncMsg {
PendingSyncMsg(int id, IPC::MessageReplyDeserializer* d,
base::WaitableEvent* e) :
@@ -133,7 +133,9 @@
// WaitableEventWatcher::Delegate implementation.
virtual void OnWaitableEventSignaled(base::WaitableEvent* arg);
- SyncContext* sync_context() { return reinterpret_cast<SyncContext*>(context()); }
+ SyncContext* sync_context() {
+ return reinterpret_cast<SyncContext*>(context());
+ }
// Both these functions wait for a reply, timeout or process shutdown. The
// latter one also runs a nested message loop in the meantime.
diff --git a/chrome/common/ipc_sync_message.cc b/chrome/common/ipc_sync_message.cc
index e895db9..9ed26792 100644
--- a/chrome/common/ipc_sync_message.cc
+++ b/chrome/common/ipc_sync_message.cc
@@ -77,7 +77,8 @@
Message* SyncMessage::GenerateReply(const Message* msg) {
DCHECK(msg->is_sync());
- Message* reply = new Message(msg->routing_id(), IPC_REPLY_ID, msg->priority());
+ Message* reply = new Message(msg->routing_id(), IPC_REPLY_ID,
+ msg->priority());
reply->set_reply();
SyncHeader header;
diff --git a/chrome/common/ipc_sync_message_unittest.cc b/chrome/common/ipc_sync_message_unittest.cc
index 6508eaf..dc6dd4a 100644
--- a/chrome/common/ipc_sync_message_unittest.cc
+++ b/chrome/common/ipc_sync_message_unittest.cc
@@ -85,7 +85,8 @@
*out2 = 32;
}
- void On_3_3(int in1, std::string in2, bool in3, std::string* out1, int* out2, bool* out3) {
+ void On_3_3(int in1, std::string in2, bool in3, std::string* out1, int* out2,
+ bool* out3) {
DCHECK(in1 == 3 && in2 == "3_3" && in3);
*out1 = "3_3";
*out2 = 33;
diff --git a/chrome/common/ipc_sync_message_unittest.h b/chrome/common/ipc_sync_message_unittest.h
index 3b32c10..409e458 100644
--- a/chrome/common/ipc_sync_message_unittest.h
+++ b/chrome/common/ipc_sync_message_unittest.h
@@ -44,11 +44,14 @@
// in1 must be 1, in2 must be false, in3 must be "3_1", out1 is true
IPC_SYNC_MESSAGE_CONTROL3_1(Msg_C_3_1, int, bool, std::string, bool)
- // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is 32
+ // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is
+ // 32
IPC_SYNC_MESSAGE_CONTROL3_2(Msg_C_3_2, std::string, bool, int, bool, int)
- // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is 33, out3 is false
- IPC_SYNC_MESSAGE_CONTROL3_3(Msg_C_3_3, int, std::string, bool, std::string, int, bool)
+ // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is
+ // 33, out3 is false
+ IPC_SYNC_MESSAGE_CONTROL3_3(Msg_C_3_3, int, std::string, bool, std::string,
+ int, bool)
// NOTE: routed messages are just a copy of the above...
@@ -83,11 +86,14 @@
// in1 must be 1, in2 must be false, in3 must be "3_1", out1 is true
IPC_SYNC_MESSAGE_ROUTED3_1(Msg_R_3_1, int, bool, std::string, bool)
- // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is 32
+ // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2
+ // is 32
IPC_SYNC_MESSAGE_ROUTED3_2(Msg_R_3_2, std::string, bool, int, bool, int)
- // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is 33, out3 is false
- IPC_SYNC_MESSAGE_ROUTED3_3(Msg_R_3_3, int, std::string, bool, std::string, int, bool)
+ // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is
+ // 33, out3 is false
+ IPC_SYNC_MESSAGE_ROUTED3_3(Msg_R_3_3, int, std::string, bool, std::string,
+ int, bool)
IPC_END_MESSAGES(TestMsg)
