Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_commands_unittest.cc

Issue 960423004: Switched variable naming style from camelCase to hacker_style in BrowserCommandsTests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_commands_unittest.cc
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index d57799ad18f5053cd4e42983b59e2db78f73a61a..4a4767af9b7810304bf7a1517841a7af84de6de3 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -239,11 +239,11 @@ TEST_F(BrowserCommandsTest, OnMaxZoomIn) {
GURL url("http://www.google.com");
AddTab(browser(), url);
- WebContents* firstTab = tab_strip_model->GetWebContentsAt(0);
+ WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
// Continue to zoom in until zoom percent reaches 500.
for (int i = 0; i < 9; ++i) {
- ui_zoom::PageZoom::Zoom(firstTab, content::PAGE_ZOOM_IN);
+ ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
}
// TODO(a.sarkar.arun@gmail.com): Figure out why Zoom-In menu item is not
@@ -252,7 +252,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomIn) {
if (chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS))
chrome::UpdateCommandEnabled(browser(), IDC_ZOOM_PLUS, false);
- ZoomController* zoom_controller = ZoomController::FromWebContents(firstTab);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
EXPECT_FLOAT_EQ(500.0f, zoom_controller->GetZoomPercent());
EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
@@ -264,14 +264,14 @@ TEST_F(BrowserCommandsTest, OnMaxZoomOut) {
GURL url("http://www.google.com");
AddTab(browser(), url);
- WebContents* firstTab = tab_strip_model->GetWebContentsAt(0);
+ WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
// Continue to zoom out until zoom percent reaches 25.
for (int i = 0; i < 7; ++i) {
- ui_zoom::PageZoom::Zoom(firstTab, content::PAGE_ZOOM_OUT);
+ ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_OUT);
}
- ZoomController* zoom_controller = ZoomController::FromWebContents(firstTab);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
EXPECT_FLOAT_EQ(25.0f, zoom_controller->GetZoomPercent());
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
@@ -283,12 +283,12 @@ TEST_F(BrowserCommandsTest, OnZoomReset) {
GURL url("http://www.google.com");
AddTab(browser(), url);
- WebContents* firstTab = tab_strip_model->GetWebContentsAt(0);
+ WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
// Change the zoom percentage to 100.
- ui_zoom::PageZoom::Zoom(firstTab, content::PAGE_ZOOM_RESET);
+ ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET);
- ZoomController* zoom_controller = ZoomController::FromWebContents(firstTab);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent());
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
@@ -300,13 +300,13 @@ TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
GURL url("http://www.google.com");
AddTab(browser(), url);
- WebContents* firstTab = tab_strip_model->GetWebContentsAt(0);
+ WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
// Changing zoom percentage from default should enable all the zoom
// NSMenuItems.
- ui_zoom::PageZoom::Zoom(firstTab, content::PAGE_ZOOM_IN);
+ ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
- ZoomController* zoom_controller = ZoomController::FromWebContents(firstTab);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
EXPECT_FLOAT_EQ(110.0f, zoom_controller->GetZoomPercent());
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
@@ -322,22 +322,22 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
// Add First tab.
AddTab(browser(), url);
AddTab(browser(), url1);
- WebContents* firstTab = tab_strip_model->GetWebContentsAt(0);
+ WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
- ZoomController* zoom_controller = ZoomController::FromWebContents(firstTab);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent());
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
// Add Second tab.
- WebContents* secondTab = tab_strip_model->GetWebContentsAt(1);
+ WebContents* second_tab = tab_strip_model->GetWebContentsAt(1);
tab_strip_model->ActivateTabAt(1, true);
EXPECT_TRUE(tab_strip_model->IsTabSelected(1));
- ui_zoom::PageZoom::Zoom(secondTab, content::PAGE_ZOOM_OUT);
+ ui_zoom::PageZoom::Zoom(second_tab, content::PAGE_ZOOM_OUT);
- zoom_controller = ZoomController::FromWebContents(secondTab);
+ zoom_controller = ZoomController::FromWebContents(second_tab);
EXPECT_FLOAT_EQ(90.0f, zoom_controller->GetZoomPercent());
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
@@ -348,8 +348,8 @@ TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) {
TabStripModel* tab_strip_model = browser()->tab_strip_model();
GURL url("http://code.google.com");
AddTab(browser(), url);
- WebContents* currentTab = tab_strip_model->GetWebContentsAt(0);
- ZoomController* zoom_controller = ZoomController::FromWebContents(currentTab);
+ WebContents* tab = tab_strip_model->GetWebContentsAt(0);
+ ZoomController* zoom_controller = ZoomController::FromWebContents(tab);
// Set the default zoom level to 125.
profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref(
@@ -362,7 +362,7 @@ TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) {
EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
// Change the zoom level.
- ui_zoom::PageZoom::Zoom(currentTab, content::PAGE_ZOOM_IN);
+ ui_zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN);
EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698