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

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

Issue 735473002: Rename app_modal_dialogs dir to app_modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" 48 #include "chrome/browser/ui/tabs/tab_strip_model.h"
49 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 50 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
51 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
52 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
53 #include "chrome/grit/chromium_strings.h" 53 #include "chrome/grit/chromium_strings.h"
54 #include "chrome/grit/generated_resources.h" 54 #include "chrome/grit/generated_resources.h"
55 #include "chrome/test/base/in_process_browser_test.h" 55 #include "chrome/test/base/in_process_browser_test.h"
56 #include "chrome/test/base/test_switches.h" 56 #include "chrome/test/base/test_switches.h"
57 #include "chrome/test/base/ui_test_utils.h" 57 #include "chrome/test/base/ui_test_utils.h"
58 #include "components/app_modal_dialogs/app_modal_dialog.h" 58 #include "components/app_modal/app_modal_dialog.h"
59 #include "components/app_modal_dialogs/app_modal_dialog_queue.h" 59 #include "components/app_modal/app_modal_dialog_queue.h"
60 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h" 60 #include "components/app_modal/javascript_app_modal_dialog.h"
61 #include "components/app_modal_dialogs/native_app_modal_dialog.h" 61 #include "components/app_modal/native_app_modal_dialog.h"
62 #include "components/content_settings/core/browser/host_content_settings_map.h" 62 #include "components/content_settings/core/browser/host_content_settings_map.h"
63 #include "components/sessions/base_session_service_test_helper.h" 63 #include "components/sessions/base_session_service_test_helper.h"
64 #include "components/translate/core/browser/language_state.h" 64 #include "components/translate/core/browser/language_state.h"
65 #include "components/translate/core/common/language_detection_details.h" 65 #include "components/translate/core/common/language_detection_details.h"
66 #include "content/public/browser/favicon_status.h" 66 #include "content/public/browser/favicon_status.h"
67 #include "content/public/browser/host_zoom_map.h" 67 #include "content/public/browser/host_zoom_map.h"
68 #include "content/public/browser/interstitial_page.h" 68 #include "content/public/browser/interstitial_page.h"
69 #include "content/public/browser/interstitial_page_delegate.h" 69 #include "content/public/browser/interstitial_page_delegate.h"
70 #include "content/public/browser/navigation_entry.h" 70 #include "content/public/browser/navigation_entry.h"
71 #include "content/public/browser/notification_service.h" 71 #include "content/public/browser/notification_service.h"
(...skipping 2579 matching lines...) Expand 10 before | Expand all | Expand 10 after
2651 #endif 2651 #endif
2652 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2652 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2653 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2653 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2654 gfx::Size exp_final_size(initial_wcv_size); 2654 gfx::Size exp_final_size(initial_wcv_size);
2655 exp_final_size.Enlarge(wcv_resize_insets.width(), 2655 exp_final_size.Enlarge(wcv_resize_insets.width(),
2656 wcv_resize_insets.height() + height_inset); 2656 wcv_resize_insets.height() + height_inset);
2657 EXPECT_EQ(exp_final_size, 2657 EXPECT_EQ(exp_final_size,
2658 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2658 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2659 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2659 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2660 } 2660 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698