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

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

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "base/mac/mac_util.h" 93 #include "base/mac/mac_util.h"
94 #include "base/mac/scoped_nsautorelease_pool.h" 94 #include "base/mac/scoped_nsautorelease_pool.h"
95 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 95 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
96 #endif 96 #endif
97 97
98 #if defined(OS_WIN) 98 #if defined(OS_WIN)
99 #include "base/i18n/rtl.h" 99 #include "base/i18n/rtl.h"
100 #include "chrome/browser/browser_process.h" 100 #include "chrome/browser/browser_process.h"
101 #endif 101 #endif
102 102
103 using app_modal_dialogs::AppModalDialog;
104 using app_modal_dialogs::AppModalDialogQueue;
105 using app_modal_dialogs::JavaScriptAppModalDialog;
103 using base::ASCIIToUTF16; 106 using base::ASCIIToUTF16;
104 using content::InterstitialPage; 107 using content::InterstitialPage;
105 using content::HostZoomMap; 108 using content::HostZoomMap;
106 using content::NavigationController; 109 using content::NavigationController;
107 using content::NavigationEntry; 110 using content::NavigationEntry;
108 using content::OpenURLParams; 111 using content::OpenURLParams;
109 using content::Referrer; 112 using content::Referrer;
110 using content::WebContents; 113 using content::WebContents;
111 using content::WebContentsObserver; 114 using content::WebContentsObserver;
112 using extensions::Extension; 115 using extensions::Extension;
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2648 #endif 2651 #endif
2649 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2652 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2650 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2653 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2651 gfx::Size exp_final_size(initial_wcv_size); 2654 gfx::Size exp_final_size(initial_wcv_size);
2652 exp_final_size.Enlarge(wcv_resize_insets.width(), 2655 exp_final_size.Enlarge(wcv_resize_insets.width(),
2653 wcv_resize_insets.height() + height_inset); 2656 wcv_resize_insets.height() + height_inset);
2654 EXPECT_EQ(exp_final_size, 2657 EXPECT_EQ(exp_final_size,
2655 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2658 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2656 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2659 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2657 } 2660 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698