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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/ui/browser_tabstrip.h" 42 #include "chrome/browser/ui/browser_tabstrip.h"
43 #include "chrome/browser/ui/browser_ui_prefs.h" 43 #include "chrome/browser/ui/browser_ui_prefs.h"
44 #include "chrome/browser/ui/browser_window.h" 44 #include "chrome/browser/ui/browser_window.h"
45 #include "chrome/browser/ui/extensions/application_launch.h" 45 #include "chrome/browser/ui/extensions/application_launch.h"
46 #include "chrome/browser/ui/host_desktop.h" 46 #include "chrome/browser/ui/host_desktop.h"
47 #include "chrome/browser/ui/startup/startup_browser_creator.h" 47 #include "chrome/browser/ui/startup/startup_browser_creator.h"
48 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" 48 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
49 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 49 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
50 #include "chrome/browser/ui/tabs/tab_strip_model.h" 50 #include "chrome/browser/ui/tabs/tab_strip_model.h"
51 #include "chrome/common/chrome_switches.h" 51 #include "chrome/common/chrome_switches.h"
52 #include "chrome/common/extensions/extension.h"
53 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 52 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
54 #include "chrome/common/translate/language_detection_details.h" 53 #include "chrome/common/translate/language_detection_details.h"
55 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
56 #include "chrome/test/base/in_process_browser_test.h" 55 #include "chrome/test/base/in_process_browser_test.h"
57 #include "chrome/test/base/test_switches.h" 56 #include "chrome/test/base/test_switches.h"
58 #include "chrome/test/base/ui_test_utils.h" 57 #include "chrome/test/base/ui_test_utils.h"
59 #include "content/public/browser/favicon_status.h" 58 #include "content/public/browser/favicon_status.h"
60 #include "content/public/browser/host_zoom_map.h" 59 #include "content/public/browser/host_zoom_map.h"
61 #include "content/public/browser/interstitial_page.h" 60 #include "content/public/browser/interstitial_page.h"
62 #include "content/public/browser/interstitial_page_delegate.h" 61 #include "content/public/browser/interstitial_page_delegate.h"
63 #include "content/public/browser/navigation_entry.h" 62 #include "content/public/browser/navigation_entry.h"
64 #include "content/public/browser/notification_service.h" 63 #include "content/public/browser/notification_service.h"
65 #include "content/public/browser/render_process_host.h" 64 #include "content/public/browser/render_process_host.h"
66 #include "content/public/browser/render_view_host.h" 65 #include "content/public/browser/render_view_host.h"
67 #include "content/public/browser/render_widget_host_view.h" 66 #include "content/public/browser/render_widget_host_view.h"
68 #include "content/public/browser/resource_context.h" 67 #include "content/public/browser/resource_context.h"
69 #include "content/public/browser/web_contents.h" 68 #include "content/public/browser/web_contents.h"
70 #include "content/public/browser/web_contents_observer.h" 69 #include "content/public/browser/web_contents_observer.h"
71 #include "content/public/browser/web_contents_view.h" 70 #include "content/public/browser/web_contents_view.h"
72 #include "content/public/common/frame_navigate_params.h" 71 #include "content/public/common/frame_navigate_params.h"
73 #include "content/public/common/page_transition_types.h" 72 #include "content/public/common/page_transition_types.h"
74 #include "content/public/common/renderer_preferences.h" 73 #include "content/public/common/renderer_preferences.h"
75 #include "content/public/common/url_constants.h" 74 #include "content/public/common/url_constants.h"
76 #include "content/public/test/browser_test_utils.h" 75 #include "content/public/test/browser_test_utils.h"
77 #include "content/public/test/test_navigation_observer.h" 76 #include "content/public/test/test_navigation_observer.h"
77 #include "extensions/common/extension.h"
78 #include "grit/chromium_strings.h" 78 #include "grit/chromium_strings.h"
79 #include "grit/generated_resources.h" 79 #include "grit/generated_resources.h"
80 #include "net/dns/mock_host_resolver.h" 80 #include "net/dns/mock_host_resolver.h"
81 #include "net/test/spawned_test_server/spawned_test_server.h" 81 #include "net/test/spawned_test_server/spawned_test_server.h"
82 #include "ui/base/l10n/l10n_util.h" 82 #include "ui/base/l10n/l10n_util.h"
83 83
84 #if defined(OS_MACOSX) 84 #if defined(OS_MACOSX)
85 #include "base/mac/mac_util.h" 85 #include "base/mac/mac_util.h"
86 #include "base/mac/scoped_nsautorelease_pool.h" 86 #include "base/mac/scoped_nsautorelease_pool.h"
87 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 87 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
(...skipping 2462 matching lines...) Expand 10 before | Expand all | Expand 10 after
2550 exp_commit_size.Enlarge(wcv_resize_insets.width(), 2550 exp_commit_size.Enlarge(wcv_resize_insets.width(),
2551 wcv_resize_insets.height() + height_inset); 2551 wcv_resize_insets.height() + height_inset);
2552 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2552 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2553 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2553 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2554 // Sizes of RenderWidgetHostView and WebContentsView before and after 2554 // Sizes of RenderWidgetHostView and WebContentsView before and after
2555 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. 2555 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same.
2556 EXPECT_EQ(rwhv_commit_size2, 2556 EXPECT_EQ(rwhv_commit_size2,
2557 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2557 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2558 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); 2558 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize());
2559 } 2559 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698