Reorganize the declarations to have some grouping and logical ordering in tab...

chrome/browser/browser_commands.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #include <commdlg.h>
 #include <shellapi.h>
 
 #include "base/file_version_info.h"
@@ skipping 212 matching lines @@
     case IDC_BACK: {
       NavigationController* nc = GetSelectedNavigationController();
       return nc ? nc->CanGoBack() : false;
     }
     case IDC_FORWARD: {
       NavigationController* nc = GetSelectedNavigationController();
       return nc ? nc->CanGoForward() : false;
     }
     case IDC_STOP: {
       TabContents* current_tab = GetSelectedTabContents();
-      return (current_tab && current_tab->IsLoading());
+      return (current_tab && current_tab->is_loading());
     }
     case IDC_CLOSETAB: {
       return !IsApplication();
     }
     default:
       return controller_.IsCommandEnabled(id);
   }
 }
 
 void Browser::ExecuteCommand(int id) {
@@ skipping 263 matching lines @@
 
     case IDC_EDIT_SEARCH_ENGINES: {
       UserMetrics::RecordAction(L"EditSearchEngines", profile_);
       OpenKeywordEditor();
       break;
     }
 
     case IDC_ZOOM_PLUS: {
       UserMetrics::RecordAction(L"ZoomPlus", profile_);
       TabContents* current_tab = GetSelectedTabContents();
-      DCHECK(current_tab);
-      current_tab->AlterTextSize(text_zoom::TEXT_LARGER);
+      if (current_tab->AsWebContents()) {
+        current_tab->AsWebContents()->render_view_host()->AlterTextSize(
+          text_zoom::TEXT_LARGER);
+      }
       break;
     }
 
     case IDC_ZOOM_MINUS: {
       UserMetrics::RecordAction(L"ZoomMinus", profile_);
       TabContents* current_tab = GetSelectedTabContents();
-      DCHECK(current_tab);
-      current_tab->AlterTextSize(text_zoom::TEXT_SMALLER);
+      if (current_tab->AsWebContents()) {
+        current_tab->AsWebContents()->render_view_host()->AlterTextSize(
+          text_zoom::TEXT_SMALLER);
+      }
       break;
     }
 
     case IDC_ZOOM_NORMAL: {
       UserMetrics::RecordAction(L"ZoomNormal", profile_);
       TabContents* current_tab = GetSelectedTabContents();
-      DCHECK(current_tab);
-      current_tab->AlterTextSize(text_zoom::TEXT_STANDARD);
+      if (current_tab->AsWebContents()) {
+        current_tab->AsWebContents()->render_view_host()->AlterTextSize(
+          text_zoom::TEXT_STANDARD);
+      }
       break;
     }
 
     case IDC_OPENFILE: {
       UserMetrics::RecordAction(L"OpenFile", profile_);
       if (!select_file_dialog_.get())
         select_file_dialog_ = SelectFileDialog::Create(this);
       select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                                       L"", L"", GetTopLevelHWND(), NULL);
       break;
@@ skipping 77 matching lines @@
     case IDC_ENCODING_ISO88596:
     case IDC_ENCODING_WINDOWS1256:
     case IDC_ENCODING_ISO88598:
     case IDC_ENCODING_WINDOWS1255:
     case IDC_ENCODING_WINDOWS1258: {
       UserMetrics::RecordAction(L"OverrideEncoding", profile_);
       const std::wstring cur_encoding_name =
           CharacterEncoding::GetCanonicalEncodingNameByCommandId(id);
       TabContents* current_tab = GetSelectedTabContents();
       if (!cur_encoding_name.empty() && current_tab)
-        current_tab->SetPageEncoding(cur_encoding_name);
+        current_tab->set_encoding(cur_encoding_name);
       // Update user recently selected encoding list.
       std::wstring new_selected_encoding_list;
       if (CharacterEncoding::UpdateRecentlySelectdEncoding(
               profile_->GetPrefs()->GetString(prefs::kRecentlySelectedEncoding),
               id,
               &new_selected_encoding_list))
         profile_->GetPrefs()->SetString(prefs::kRecentlySelectedEncoding,
                                         new_selected_encoding_list);
        break;
     }
@@ skipping 427 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const std::wstring& path, void* params) {
   GURL file_url = net::FilePathToFileURL(path);
   if (!file_url.is_empty())
     OpenURL(file_url, CURRENT_TAB, PageTransition::TYPED);
 }