diff options
| -rw-r--r-- | chrome/browser/ui/browser.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/ui/tab_contents/core_tab_helper.cc | 23 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view.cc | 13 |
3 files changed, 51 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 21e292e..48fb86c 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2478,6 +2478,11 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, } void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is + // fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 Browser::UpdateBookmarkBarState1")); BookmarkBar::State state; // The bookmark bar is always hidden for Guest Sessions and in fullscreen // mode, unless on the new tab page. @@ -2488,6 +2493,11 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) { !ShouldHideUIForFullscreen()) { state = BookmarkBar::SHOW; } else { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 + // is fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 Browser::UpdateBookmarkBarState2")); WebContents* web_contents = tab_strip_model_->GetActiveWebContents(); BookmarkTabHelper* bookmark_tab_helper = web_contents ? BookmarkTabHelper::FromWebContents(web_contents) : NULL; @@ -2512,6 +2522,12 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) { return; } + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is + // fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 Browser::UpdateBookmarkBarState3")); + bool should_animate = reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE; window_->BookmarkBarStateChanged(should_animate ? BookmarkBar::ANIMATE_STATE_CHANGE : diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index 8a95850..26fdafa 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" +#include "base/profiler/scoped_tracker.h" #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" @@ -86,11 +87,21 @@ void CoreTabHelper::UpdateContentRestrictions(int content_restrictions) { // static bool CoreTabHelper::GetStatusTextForWebContents( base::string16* status_text, content::WebContents* source) { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is + // fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 CoreTabHelper::GetStatusTextForWebContents1")); auto guest_manager = extensions::GuestViewManager::FromBrowserContextIfAvailable( source->GetBrowserContext()); if (!source->IsLoading() || source->GetLoadState().state == net::LOAD_STATE_IDLE) { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 + // is fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 CoreTabHelper::GetStatusTextForWebContents2")); if (!guest_manager) return false; return guest_manager->ForEachGuest( @@ -98,6 +109,12 @@ bool CoreTabHelper::GetStatusTextForWebContents( status_text)); } + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 + // is fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 CoreTabHelper::GetStatusTextForWebContents3")); + switch (source->GetLoadState().state) { case net::LOAD_STATE_WAITING_FOR_STALLED_SOCKET_POOL: case net::LOAD_STATE_WAITING_FOR_AVAILABLE_SOCKET: @@ -172,6 +189,12 @@ bool CoreTabHelper::GetStatusTextForWebContents( } if (!guest_manager) return false; + + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is + // fixed. + tracked_objects::ScopedTracker tracking_profile4( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 CoreTabHelper::GetStatusTextForWebContents4")); return guest_manager->ForEachGuest( source, base::Bind(&CoreTabHelper::GetStatusTextForWebContents, status_text)); diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index b86f397..6113a09 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_tracker.h" #include "base/strings/string_number_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" @@ -760,9 +761,19 @@ namespace { } void BrowserView::UpdateTitleBar() { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is + // fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION("467185 BrowserView::UpdateTitleBar1")); frame_->UpdateWindowTitle(); - if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning()) + if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning()) { + // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 + // is fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "467185 BrowserView::UpdateTitleBar2")); frame_->UpdateWindowIcon(); + } } void BrowserView::BookmarkBarStateChanged( |