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

Side by Side Diff: chrome/browser/ui/panels/base_panel_browser_test.cc

Issue 8898027: Revert 114083 - Convert app_launch_index and page_index from int to StringOrdinal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "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"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/panels/native_panel.h" 17 #include "chrome/browser/ui/panels/native_panel.h"
18 #include "chrome/browser/ui/panels/panel_manager.h" 18 #include "chrome/browser/ui/panels/panel_manager.h"
19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/string_ordinal.h"
23 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
24 #include "content/browser/tab_contents/test_tab_contents.h" 23 #include "content/browser/tab_contents/test_tab_contents.h"
25 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
26 #include "content/public/common/url_constants.h" 25 #include "content/public/common/url_constants.h"
27 26
28 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
29 #include "base/mac/scoped_nsautorelease_pool.h" 28 #include "base/mac/scoped_nsautorelease_pool.h"
30 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 29 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
31 #endif 30 #endif
32 31
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0"); 371 input_value->SetString(extension_manifest_keys::kVersion, "1.0.0.0");
373 input_value->SetString(extension_manifest_keys::kName, "Sample Extension"); 372 input_value->SetString(extension_manifest_keys::kName, "Sample Extension");
374 373
375 std::string error; 374 std::string error;
376 scoped_refptr<Extension> extension = Extension::Create( 375 scoped_refptr<Extension> extension = Extension::Create(
377 full_path, location, *input_value, 376 full_path, location, *input_value,
378 Extension::STRICT_ERROR_CHECKS, &error); 377 Extension::STRICT_ERROR_CHECKS, &error);
379 EXPECT_TRUE(extension.get()); 378 EXPECT_TRUE(extension.get());
380 EXPECT_STREQ("", error.c_str()); 379 EXPECT_STREQ("", error.c_str());
381 browser()->GetProfile()->GetExtensionService()-> 380 browser()->GetProfile()->GetExtensionService()->
382 OnExtensionInstalled(extension.get(), false, StringOrdinal()); 381 OnExtensionInstalled(extension.get(), false, -1);
383 return extension; 382 return extension;
384 } 383 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698