summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 15:09:07 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 15:09:07 +0000
commitb0cad01a3ac72caf37ba8905087c086de0b4a0a8 (patch)
treeeec2bc1bac3a265697b48d4062305577956e70c1
parent6d1450ac380ba94d72c979eef2815e7fd6f041d5 (diff)
downloadchromium_src-b0cad01a3ac72caf37ba8905087c086de0b4a0a8.zip
chromium_src-b0cad01a3ac72caf37ba8905087c086de0b4a0a8.tar.gz
chromium_src-b0cad01a3ac72caf37ba8905087c086de0b4a0a8.tar.bz2
Compile fix for touchui.
views::ViewStorage::GetSharedInstance didn't get renamed to GetInstance in a previous CL. BUG=chrome doesn't compile with touchui=1 TEST=see bug Review URL: http://codereview.chromium.org/5807001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68999 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index f8ad16c..3fed4e7 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -40,7 +40,7 @@ TabContentsViewViews::TabContentsViewViews(TabContents* tab_contents)
sad_tab_(NULL),
ignore_next_char_event_(false) {
last_focused_view_storage_id_ =
- views::ViewStorage::GetSharedInstance()->CreateStorageID();
+ views::ViewStorage::GetInstance()->CreateStorageID();
SetLayoutManager(new views::FillLayout());
}
@@ -49,7 +49,7 @@ TabContentsViewViews::~TabContentsViewViews() {
//
// It is possible the view went away before us, so we only do this if the
// view is registered.
- views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+ views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
if (view_storage->RetrieveView(last_focused_view_storage_id_) != NULL)
view_storage->RemoveView(last_focused_view_storage_id_);
}
@@ -166,7 +166,7 @@ void TabContentsViewViews::SetInitialFocus() {
}
void TabContentsViewViews::StoreFocus() {
- views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+ views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
if (view_storage->RetrieveView(last_focused_view_storage_id_) != NULL)
view_storage->RemoveView(last_focused_view_storage_id_);
@@ -183,7 +183,7 @@ void TabContentsViewViews::StoreFocus() {
}
void TabContentsViewViews::RestoreFocus() {
- views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+ views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
views::View* last_focused_view =
view_storage->RetrieveView(last_focused_view_storage_id_);
if (!last_focused_view) {