| OLD | NEW |
| 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 "chrome/browser/ui/panels/base_panel_browser_test.h" | 5 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 FILE_PATH_LITERAL("panels"); | 233 FILE_PATH_LITERAL("panels"); |
| 234 | 234 |
| 235 BasePanelBrowserTest::BasePanelBrowserTest() | 235 BasePanelBrowserTest::BasePanelBrowserTest() |
| 236 : InProcessBrowserTest(), | 236 : InProcessBrowserTest(), |
| 237 mock_display_settings_enabled_(true) { | 237 mock_display_settings_enabled_(true) { |
| 238 } | 238 } |
| 239 | 239 |
| 240 BasePanelBrowserTest::~BasePanelBrowserTest() { | 240 BasePanelBrowserTest::~BasePanelBrowserTest() { |
| 241 } | 241 } |
| 242 | 242 |
| 243 void BasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) { | 243 void BasePanelBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { |
| 244 command_line->AppendSwitch(switches::kEnablePanels); | 244 command_line->AppendSwitch(switches::kEnablePanels); |
| 245 } | 245 } |
| 246 | 246 |
| 247 void BasePanelBrowserTest::SetUpOnMainThread() { | 247 void BasePanelBrowserTest::SetUpOnMainThread() { |
| 248 InProcessBrowserTest::SetUpOnMainThread(); | 248 InProcessBrowserTest::SetUpOnMainThread(); |
| 249 | 249 |
| 250 // Setup the work area and desktop bar so that we have consistent testing | 250 // Setup the work area and desktop bar so that we have consistent testing |
| 251 // environment for all panel related tests. | 251 // environment for all panel related tests. |
| 252 if (mock_display_settings_enabled_) { | 252 if (mock_display_settings_enabled_) { |
| 253 mock_display_settings_provider_ = new MockDisplaySettingsProviderImpl(); | 253 mock_display_settings_provider_ = new MockDisplaySettingsProviderImpl(); |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 } | 592 } |
| 593 | 593 |
| 594 std::string BasePanelBrowserTest::MakePanelName(int index) { | 594 std::string BasePanelBrowserTest::MakePanelName(int index) { |
| 595 std::string panel_name("Panel"); | 595 std::string panel_name("Panel"); |
| 596 return panel_name + base::IntToString(index); | 596 return panel_name + base::IntToString(index); |
| 597 } | 597 } |
| 598 | 598 |
| 599 bool BasePanelBrowserTest::WmSupportWindowActivation() { | 599 bool BasePanelBrowserTest::WmSupportWindowActivation() { |
| 600 return true; | 600 return true; |
| 601 } | 601 } |
| OLD | NEW |