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/old_base_panel_browser_test.h" | 5 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h" |
6 | 6 |
7 #include "chrome/browser/ui/browser_list.h" | 7 #include "chrome/browser/ui/browser_list.h" |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 scoped_ptr<DictionaryValue> input_value(extra_value.DeepCopy()); | 439 scoped_ptr<DictionaryValue> input_value(extra_value.DeepCopy()); |
440 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0"); | 440 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0"); |
441 input_value->SetString(extension_manifest_keys::kName, "Sample Extension"); | 441 input_value->SetString(extension_manifest_keys::kName, "Sample Extension"); |
442 | 442 |
443 std::string error; | 443 std::string error; |
444 scoped_refptr<Extension> extension = Extension::Create( | 444 scoped_refptr<Extension> extension = Extension::Create( |
445 full_path, location, *input_value, Extension::NO_FLAGS, &error); | 445 full_path, location, *input_value, Extension::NO_FLAGS, &error); |
446 EXPECT_TRUE(extension.get()); | 446 EXPECT_TRUE(extension.get()); |
447 EXPECT_STREQ("", error.c_str()); | 447 EXPECT_STREQ("", error.c_str()); |
448 browser()->profile()->GetExtensionService()-> | 448 browser()->profile()->GetExtensionService()-> |
449 OnExtensionInstalled(extension.get(), false, syncer::StringOrdinal()); | 449 OnExtensionInstalled(extension.get(), false /* not from webstore */, |
| 450 syncer::StringOrdinal(), |
| 451 false /* no requirement errors */); |
450 return extension; | 452 return extension; |
451 } | 453 } |
452 | 454 |
453 void OldBasePanelBrowserTest::SetTestingAreas( | 455 void OldBasePanelBrowserTest::SetTestingAreas( |
454 const gfx::Rect& primary_screen_area, | 456 const gfx::Rect& primary_screen_area, |
455 const gfx::Rect& work_area) { | 457 const gfx::Rect& work_area) { |
456 DCHECK(primary_screen_area.Contains(work_area)); | 458 DCHECK(primary_screen_area.Contains(work_area)); |
457 mock_display_settings_provider_->SetPrimaryScreenArea(primary_screen_area); | 459 mock_display_settings_provider_->SetPrimaryScreenArea(primary_screen_area); |
458 mock_display_settings_provider_->SetWorkArea( | 460 mock_display_settings_provider_->SetWorkArea( |
459 work_area.IsEmpty() ? primary_screen_area : work_area); | 461 work_area.IsEmpty() ? primary_screen_area : work_area); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 } | 497 } |
496 | 498 |
497 void OldBasePanelBrowserTest::MoveMouse(const gfx::Point& position) { | 499 void OldBasePanelBrowserTest::MoveMouse(const gfx::Point& position) { |
498 PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position); | 500 PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position); |
499 } | 501 } |
500 | 502 |
501 std::string OldBasePanelBrowserTest::MakePanelName(int index) { | 503 std::string OldBasePanelBrowserTest::MakePanelName(int index) { |
502 std::string panel_name("Panel"); | 504 std::string panel_name("Panel"); |
503 return panel_name + base::IntToString(index); | 505 return panel_name + base::IntToString(index); |
504 } | 506 } |
OLD | NEW |