diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 17:28:43 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 17:28:43 +0000 |
commit | 38e0898607eea03649b7b07e9cf890af7dc33ac7 (patch) | |
tree | 6ac95fd496661a6e0718c349bba089144e0fef09 /chrome/browser/sidebar | |
parent | 2a9662e31f18f77b856487b7266c70ccede557e0 (diff) | |
download | chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.zip chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.tar.gz chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.tar.bz2 |
FBTF: More dtor deinlining. (Can almost see the end!)
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3962004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
-rw-r--r-- | chrome/browser/sidebar/sidebar_manager.cc | 7 | ||||
-rw-r--r-- | chrome/browser/sidebar/sidebar_manager.h | 17 |
2 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/sidebar/sidebar_manager.cc b/chrome/browser/sidebar/sidebar_manager.cc index 62c46c14..e77041c 100644 --- a/chrome/browser/sidebar/sidebar_manager.cc +++ b/chrome/browser/sidebar/sidebar_manager.cc @@ -18,6 +18,13 @@ #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" +struct SidebarManager::SidebarStateForTab { + // Sidebars linked to this tab. + ContentIdToSidebarHostMap content_id_to_sidebar_host; + // Content id of the currently active (expanded and visible) sidebar. + std::string active_content_id; +}; + // static SidebarManager* SidebarManager::GetInstance() { return g_browser_process->sidebar_manager(); diff --git a/chrome/browser/sidebar/sidebar_manager.h b/chrome/browser/sidebar/sidebar_manager.h index a7fe8b1..6f2d20b 100644 --- a/chrome/browser/sidebar/sidebar_manager.h +++ b/chrome/browser/sidebar/sidebar_manager.h @@ -127,25 +127,18 @@ class SidebarManager : public NotificationObserver, // This map stores sidebars linked to a particular tab. Sidebars are // identified by their unique content id (string). - typedef std::map<std::string, SidebarContainer*> - ContentIdToSidebarHostMap; + typedef std::map<std::string, SidebarContainer*> ContentIdToSidebarHostMap; + // These two maps are for tracking dependencies between tabs and // their SidebarContainers. // // SidebarManager start listening to SidebarContainers when they are put // into these maps and removes them when they are closing. - typedef struct { - // Sidebars linked to this tab. - ContentIdToSidebarHostMap content_id_to_sidebar_host; - // Content id of the currently active (expanded and visible) sidebar. - std::string active_content_id; - } SidebarStateForTab; - typedef std::map<TabContents*, SidebarStateForTab> - TabToSidebarHostMap; + struct SidebarStateForTab; + typedef std::map<TabContents*, SidebarStateForTab> TabToSidebarHostMap; TabToSidebarHostMap tab_to_sidebar_host_; - typedef std::map<SidebarContainer*, TabContents*> - SidebarHostToTabMap; + typedef std::map<SidebarContainer*, TabContents*> SidebarHostToTabMap; SidebarHostToTabMap sidebar_host_to_tab_; DISALLOW_COPY_AND_ASSIGN(SidebarManager); |