Commit 24f5e249 authored by rucifer1217@gmail.com's avatar rucifer1217@gmail.com

clean up coding style at ash folder.

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
parent 6b54fda6
...@@ -57,5 +57,5 @@ void ToggleShowPaintRects() { ...@@ -57,5 +57,5 @@ void ToggleShowPaintRects() {
} }
} }
} // debug } // namespace debug
} // ash } // namespace ash
...@@ -16,7 +16,7 @@ ASH_EXPORT void ToggleShowDebugBorders(); ...@@ -16,7 +16,7 @@ ASH_EXPORT void ToggleShowDebugBorders();
ASH_EXPORT void ToggleShowFpsCounter(); ASH_EXPORT void ToggleShowFpsCounter();
ASH_EXPORT void ToggleShowPaintRects(); ASH_EXPORT void ToggleShowPaintRects();
} // debug } // namespace debug
} // ash } // namespace ash
#endif // ASH_DEBUG_H_ #endif // ASH_DEBUG_H_
...@@ -318,7 +318,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) { ...@@ -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(-400, 100)));
EXPECT_EQ(root_windows[1], wm::GetRootWindowAt(gfx::Point(-1, 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(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. // Zero origin.
EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(0, 0))); EXPECT_EQ(root_windows[0], wm::GetRootWindowAt(gfx::Point(0, 0)));
...@@ -671,7 +671,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) { ...@@ -671,7 +671,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) {
EXPECT_EQ("1300,100 80x80", EXPECT_EQ("1300,100 80x80",
w11_t1->GetWindowBoundsInScreen().ToString()); 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());
EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow()); EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
......
...@@ -610,8 +610,8 @@ TEST_F(NoSessionRootWindowControllerTest, Event) { ...@@ -610,8 +610,8 @@ TEST_F(NoSessionRootWindowControllerTest, Event) {
gfx::Point(size.width() - 1, size.height() - 1))); gfx::Point(size.width() - 1, size.height() - 1)));
} }
class VirtualKeyboardRootWindowControllerTest : public RootWindowControllerTest class VirtualKeyboardRootWindowControllerTest
{ : public RootWindowControllerTest {
public: public:
VirtualKeyboardRootWindowControllerTest() {}; VirtualKeyboardRootWindowControllerTest() {};
virtual ~VirtualKeyboardRootWindowControllerTest() {}; virtual ~VirtualKeyboardRootWindowControllerTest() {};
......
...@@ -56,7 +56,7 @@ class ASH_EXPORT ScreenUtil { ...@@ -56,7 +56,7 @@ class ASH_EXPORT ScreenUtil {
// invalid display if no such display is connected. // invalid display if no such display is connected.
static const gfx::Display& GetDisplayForId(int64 display_id); static const gfx::Display& GetDisplayForId(int64 display_id);
private: private:
ScreenUtil() {} ScreenUtil() {}
~ScreenUtil() {} ~ScreenUtil() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment