summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 11:23:54 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 11:23:54 +0000
commitc210b130be8e357541a8876f851379a742049d00 (patch)
treea99c0b4e5842e8a1799d4abaa148fc82dd40d446 /chrome/browser/extensions
parenteba299370522353ca08036394ab4443e84e990ae (diff)
downloadchromium_src-c210b130be8e357541a8876f851379a742049d00.zip
chromium_src-c210b130be8e357541a8876f851379a742049d00.tar.gz
chromium_src-c210b130be8e357541a8876f851379a742049d00.tar.bz2
Revert 148077 - Remove destructor from FrameNavigationState::FrameID so we can use it as a static
BUG=none TEST=no additional exit time dtors Review URL: https://chromiumcodereview.appspot.com/10806084 TBR=jochen@chromium.org Review URL: https://chromiumcodereview.appspot.com/10818024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc2
-rw-r--r--chrome/browser/extensions/api/web_navigation/frame_navigation_state.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index f135275..21f89ba 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -35,6 +35,8 @@ FrameNavigationState::FrameID::FrameID(int64 frame_num,
render_process_id(render_process_id) {
}
+FrameNavigationState::FrameID::~FrameID() {}
+
bool FrameNavigationState::FrameID::operator<(
const FrameNavigationState::FrameID& other) const {
return frame_num < other.frame_num ||
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
index 4929019..7c652dc 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
@@ -24,6 +24,7 @@ class FrameNavigationState {
struct FrameID {
FrameID();
FrameID(int64 frame_num, int render_process_id);
+ ~FrameID();
bool operator<(const FrameID& other) const;
bool operator==(const FrameID& other) const;