diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:32:43 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:32:43 +0000 |
| commit | 46d04faeb3289f2362255b942c1c0613025b86b9 (patch) | |
| tree | df5b90befae7b6088e8c3a51a6e88a5321e7c604 /content/shell/shell.cc | |
| parent | 675a160f4f272e25bcef48f6471a8f1fc71d21b5 (diff) | |
| download | chromium_src-46d04faeb3289f2362255b942c1c0613025b86b9.zip chromium_src-46d04faeb3289f2362255b942c1c0613025b86b9.tar.gz chromium_src-46d04faeb3289f2362255b942c1c0613025b86b9.tar.bz2 | |
Change content shell variable names to be more xplat.
BUG=90445
TEST=none
Review URL: http://codereview.chromium.org/8171002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell.cc')
| -rw-r--r-- | content/shell/shell.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/shell/shell.cc b/content/shell/shell.cc index e33682e..3e3801b 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -24,8 +24,8 @@ namespace content { std::vector<Shell*> Shell::windows_; Shell::Shell() - : main_window_(NULL), - edit_window_(NULL) + : window_(NULL), + url_edit_view_(NULL) #if defined(OS_WIN) , default_edit_wnd_proc_(0) #endif @@ -62,10 +62,10 @@ Shell* Shell::CreateNewWindow(content::BrowserContext* browser_context, NULL)); shell->tab_contents_->set_delegate(shell); -#if defined (OS_WIN) +#if defined(OS_WIN) TabContentsViewWin* view = static_cast<TabContentsViewWin*>(shell->tab_contents_->view()); - view->SetParent(shell->main_window_); + view->SetParent(shell->window_); #endif shell->PlatformResizeSubViews(); |