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

Side by Side Diff: ash/root_window_controller_unittest.cc

Issue 396273004: clean up coding style at ash folder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1))); 603 root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1)));
604 EXPECT_EQ(event_target, 604 EXPECT_EQ(event_target,
605 root->GetEventHandlerForPoint(gfx::Point(size.width() - 1, 0))); 605 root->GetEventHandlerForPoint(gfx::Point(size.width() - 1, 0)));
606 EXPECT_EQ(event_target, 606 EXPECT_EQ(event_target,
607 root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1))); 607 root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1)));
608 EXPECT_EQ(event_target, 608 EXPECT_EQ(event_target,
609 root->GetEventHandlerForPoint( 609 root->GetEventHandlerForPoint(
610 gfx::Point(size.width() - 1, size.height() - 1))); 610 gfx::Point(size.width() - 1, size.height() - 1)));
611 } 611 }
612 612
613 class VirtualKeyboardRootWindowControllerTest : public RootWindowControllerTest 613 class VirtualKeyboardRootWindowControllerTest : public RootWindowControllerTest {
Daniel Erat 2014/07/21 17:15:10 this should probably be wrapped, right? class Vir
rucifer1217 2014/07/21 21:54:27 i will add new line.
614 {
615 public: 614 public:
616 VirtualKeyboardRootWindowControllerTest() {}; 615 VirtualKeyboardRootWindowControllerTest() {};
617 virtual ~VirtualKeyboardRootWindowControllerTest() {}; 616 virtual ~VirtualKeyboardRootWindowControllerTest() {};
618 617
619 virtual void SetUp() OVERRIDE { 618 virtual void SetUp() OVERRIDE {
620 CommandLine::ForCurrentProcess()->AppendSwitch( 619 CommandLine::ForCurrentProcess()->AppendSwitch(
621 keyboard::switches::kEnableVirtualKeyboard); 620 keyboard::switches::kEnableVirtualKeyboard);
622 test::AshTestBase::SetUp(); 621 test::AshTestBase::SetUp();
623 Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 622 Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
624 keyboard::KeyboardController::GetInstance()); 623 keyboard::KeyboardController::GetInstance());
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 if (switches::IsTextInputFocusManagerEnabled()) { 835 if (switches::IsTextInputFocusManagerEnabled()) {
837 ui::TextInputFocusManager::GetInstance()->BlurTextInputClient( 836 ui::TextInputFocusManager::GetInstance()->BlurTextInputClient(
838 &text_input_client); 837 &text_input_client);
839 } else { 838 } else {
840 input_method->SetFocusedTextInputClient(NULL); 839 input_method->SetFocusedTextInputClient(NULL);
841 } 840 }
842 } 841 }
843 842
844 } // namespace test 843 } // namespace test
845 } // namespace ash 844 } // namespace ash
OLDNEW
« ash/debug.cc ('K') | « ash/extended_desktop_unittest.cc ('k') | ash/screen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698