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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | components/components_tests.gyp » ('J')
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"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/chrome_content_browser_client.h" 16 #include "chrome/browser/chrome_content_browser_client.h"
17 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/command_updater.h" 18 #include "chrome/browser/command_updater.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/defaults.h" 19 #include "chrome/browser/defaults.h"
21 #include "chrome/browser/devtools/devtools_window_testing.h" 20 #include "chrome/browser/devtools/devtools_window_testing.h"
22 #include "chrome/browser/extensions/extension_browsertest.h" 21 #include "chrome/browser/extensions/extension_browsertest.h"
23 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
24 #include "chrome/browser/extensions/tab_helper.h" 23 #include "chrome/browser/extensions/tab_helper.h"
25 #include "chrome/browser/first_run/first_run.h" 24 #include "chrome/browser/first_run/first_run.h"
26 #include "chrome/browser/lifetime/application_lifetime.h" 25 #include "chrome/browser/lifetime/application_lifetime.h"
27 #include "chrome/browser/prefs/incognito_mode_prefs.h" 26 #include "chrome/browser/prefs/incognito_mode_prefs.h"
28 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/profiles/profile_manager.h" 28 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 23 matching lines...) Expand all
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" 52 #include "chrome/browser/ui/tabs/tab_strip_model.h"
54 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 54 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
56 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
57 #include "chrome/common/url_constants.h" 56 #include "chrome/common/url_constants.h"
58 #include "chrome/grit/chromium_strings.h" 57 #include "chrome/grit/chromium_strings.h"
59 #include "chrome/grit/generated_resources.h" 58 #include "chrome/grit/generated_resources.h"
60 #include "chrome/test/base/in_process_browser_test.h" 59 #include "chrome/test/base/in_process_browser_test.h"
61 #include "chrome/test/base/test_switches.h" 60 #include "chrome/test/base/test_switches.h"
62 #include "chrome/test/base/ui_test_utils.h" 61 #include "chrome/test/base/ui_test_utils.h"
62 #include "components/content_settings/core/browser/host_content_settings_map.h"
63 #include "components/translate/core/browser/language_state.h" 63 #include "components/translate/core/browser/language_state.h"
64 #include "components/translate/core/common/language_detection_details.h" 64 #include "components/translate/core/common/language_detection_details.h"
65 #include "content/public/browser/favicon_status.h" 65 #include "content/public/browser/favicon_status.h"
66 #include "content/public/browser/host_zoom_map.h" 66 #include "content/public/browser/host_zoom_map.h"
67 #include "content/public/browser/interstitial_page.h" 67 #include "content/public/browser/interstitial_page.h"
68 #include "content/public/browser/interstitial_page_delegate.h" 68 #include "content/public/browser/interstitial_page_delegate.h"
69 #include "content/public/browser/navigation_entry.h" 69 #include "content/public/browser/navigation_entry.h"
70 #include "content/public/browser/notification_service.h" 70 #include "content/public/browser/notification_service.h"
71 #include "content/public/browser/render_frame_host.h" 71 #include "content/public/browser/render_frame_host.h"
72 #include "content/public/browser/render_process_host.h" 72 #include "content/public/browser/render_process_host.h"
(...skipping 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2641 #endif 2641 #endif
2642 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2642 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2643 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2643 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2644 gfx::Size exp_final_size(initial_wcv_size); 2644 gfx::Size exp_final_size(initial_wcv_size);
2645 exp_final_size.Enlarge(wcv_resize_insets.width(), 2645 exp_final_size.Enlarge(wcv_resize_insets.width(),
2646 wcv_resize_insets.height() + height_inset); 2646 wcv_resize_insets.height() + height_inset);
2647 EXPECT_EQ(exp_final_size, 2647 EXPECT_EQ(exp_final_size,
2648 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2648 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2649 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2649 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2650 } 2650 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | components/components_tests.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698