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

Side by Side Diff: chrome/browser/ui/tabs/tab_strip_model_unittest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
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 "chrome/browser/ui/tabs/tab_strip_model.h" 5 #include "chrome/browser/ui/tabs/tab_strip_model.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 1699 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 FilePath path(FILE_PATH_LITERAL("c:\\foo")); 1710 FilePath path(FILE_PATH_LITERAL("c:\\foo"));
1711 #elif defined(OS_POSIX) 1711 #elif defined(OS_POSIX)
1712 FilePath path(FILE_PATH_LITERAL("/foo")); 1712 FilePath path(FILE_PATH_LITERAL("/foo"));
1713 #endif 1713 #endif
1714 1714
1715 DictionaryValue manifest; 1715 DictionaryValue manifest;
1716 manifest.SetString("name", "hi!"); 1716 manifest.SetString("name", "hi!");
1717 manifest.SetString("version", "1"); 1717 manifest.SetString("version", "1");
1718 std::string error; 1718 std::string error;
1719 scoped_refptr<Extension> extension_app( 1719 scoped_refptr<Extension> extension_app(
1720 Extension::Create(path, Extension::INVALID, manifest, Extension::NO_FLAGS, 1720 Extension::Create(path, extensions::Manifest::INVALID_LOCATION,
1721 &error)); 1721 manifest, Extension::NO_FLAGS, &error));
1722 extension_app->launch_web_url_ = "http://www.google.com"; 1722 extension_app->launch_web_url_ = "http://www.google.com";
1723 WebContents* contents1 = CreateWebContents(); 1723 WebContents* contents1 = CreateWebContents();
1724 extensions::TabHelper::CreateForWebContents(contents1); 1724 extensions::TabHelper::CreateForWebContents(contents1);
1725 extensions::TabHelper::FromWebContents(contents1)-> 1725 extensions::TabHelper::FromWebContents(contents1)->
1726 SetExtensionApp(extension_app); 1726 SetExtensionApp(extension_app);
1727 WebContents* contents2 = CreateWebContents(); 1727 WebContents* contents2 = CreateWebContents();
1728 extensions::TabHelper::CreateForWebContents(contents2); 1728 extensions::TabHelper::CreateForWebContents(contents2);
1729 extensions::TabHelper::FromWebContents(contents2)-> 1729 extensions::TabHelper::FromWebContents(contents2)->
1730 SetExtensionApp(extension_app); 1730 SetExtensionApp(extension_app);
1731 WebContents* contents3 = CreateWebContents(); 1731 WebContents* contents3 = CreateWebContents();
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 strip.ActivateTabAt(1, true); 2333 strip.ActivateTabAt(1, true);
2334 ASSERT_EQ(1, observer.GetStateCount()); 2334 ASSERT_EQ(1, observer.GetStateCount());
2335 State s(contents2, 1, MockTabStripModelObserver::SELECT); 2335 State s(contents2, 1, MockTabStripModelObserver::SELECT);
2336 s.src_contents = contents2; 2336 s.src_contents = contents2;
2337 s.src_index = 1; 2337 s.src_index = 1;
2338 s.user_gesture = false; 2338 s.user_gesture = false;
2339 EXPECT_TRUE(observer.StateEquals(0, s)); 2339 EXPECT_TRUE(observer.StateEquals(0, s));
2340 strip.RemoveObserver(&observer); 2340 strip.RemoveObserver(&observer);
2341 strip.CloseAllTabs(); 2341 strip.CloseAllTabs();
2342 } 2342 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698