diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 21:07:27 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 21:07:27 +0000 |
| commit | d3216441b7726c31fb0ae9b9d90b64421e14ca39 (patch) | |
| tree | 653882df34541ec7aa37e4024f8fce27fd9ba5b6 /chrome/browser/tab_contents | |
| parent | ba61ace67a08e56026d2e8034d7a938d2f8e5bd6 (diff) | |
| download | chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.zip chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.gz chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/tab_contents')
5 files changed, 11 insertions, 8 deletions
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 @@ void InterstitialPage::DidNavigate( // 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 a35f454..263a5ce 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -475,7 +475,7 @@ NavigationEntry* NavigationController::CreateNavigationEntry( 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 @@ void RenderViewContextMenuController::ExecuteCommand(int id) { 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 @@ bool SiteInstance::IsSameWebSite(const GURL& url1, const GURL& url2) { 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..efd17d8 100644 --- a/chrome/browser/tab_contents/tab_contents_factory.cc +++ b/chrome/browser/tab_contents/tab_contents_factory.cc @@ -45,7 +45,8 @@ TabContents* TabContents::CreateWithType(TabContentsType type, 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. |