Skip to content

Commit

Permalink
clean up coding style at ash folder.
Browse files Browse the repository at this point in the history
BUG=none

Review URL: https://codereview.chromium.org/396273004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284594 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
rucifer1217@gmail.com committed Jul 22, 2014
1 parent 6b54fda commit 24f5e24
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ash/ash_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ extern const SkColor kFocusBorderColor;
// immersive-fullscreen window.
extern const int kImmersiveFullscreenTopEdgeInset;

} // namespace ash
} // namespace ash

#endif // ASH_ASH_CONSTANTS_H_
2 changes: 1 addition & 1 deletion ash/cancel_mode.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ namespace ash {
// Sends a CancelMode event to all window hierarchies.
void DispatchCancelMode();

} // namespace ash
} // namespace ash

#endif // ASH_CANCEL_MODE_H_
4 changes: 2 additions & 2 deletions ash/debug.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ void ToggleShowPaintRects() {
}
}

} // debug
} // ash
} // namespace debug
} // namespace ash
4 changes: 2 additions & 2 deletions ash/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ASH_EXPORT void ToggleShowDebugBorders();
ASH_EXPORT void ToggleShowFpsCounter();
ASH_EXPORT void ToggleShowPaintRects();

} // debug
} // ash
} // namespace debug
} // namespace ash

#endif // ASH_DEBUG_H_
4 changes: 2 additions & 2 deletions ash/extended_desktop_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
EXPECT_EQ(root_windows[1], wm::GetRootWindowAt(gfx::Point(-400, 100)));
EXPECT_EQ(root_windows[1], wm::GetRootWindowAt(gfx::Point(-1, 100)));
EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(0, 300)));
EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(700,300)));
EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(700, 300)));

// Zero origin.
EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(0, 0)));
Expand Down Expand Up @@ -671,7 +671,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) {
EXPECT_EQ("1300,100 80x80",
w11_t1->GetWindowBoundsInScreen().ToString());

w1->SetBounds(gfx::Rect(1100,10,100,100));
w1->SetBounds(gfx::Rect(1100, 10, 100, 100));

EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
Expand Down
4 changes: 2 additions & 2 deletions ash/root_window_controller_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,8 @@ TEST_F(NoSessionRootWindowControllerTest, Event) {
gfx::Point(size.width() - 1, size.height() - 1)));
}

class VirtualKeyboardRootWindowControllerTest : public RootWindowControllerTest
{
class VirtualKeyboardRootWindowControllerTest
: public RootWindowControllerTest {
public:
VirtualKeyboardRootWindowControllerTest() {};
virtual ~VirtualKeyboardRootWindowControllerTest() {};
Expand Down
2 changes: 1 addition & 1 deletion ash/screen_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ASH_EXPORT ScreenUtil {
// invalid display if no such display is connected.
static const gfx::Display& GetDisplayForId(int64 display_id);

private:
private:
ScreenUtil() {}
~ScreenUtil() {}

Expand Down

0 comments on commit 24f5e24

Please sign in to comment.