OLD | NEW |
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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/location.h" |
7 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
8 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
12 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" | 13 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" |
13 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
14 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
16 #include "content/public/browser/browser_context.h" | 17 #include "content/public/browser/browser_context.h" |
(...skipping 30 matching lines...) Expand all Loading... |
47 } | 48 } |
48 | 49 |
49 private: | 50 private: |
50 // TODO(xiyuan): Update this when WidgetDelegate has bounds change hook. | 51 // TODO(xiyuan): Update this when WidgetDelegate has bounds change hook. |
51 void SaveWindowPlacement(const gfx::Rect& bounds, | 52 void SaveWindowPlacement(const gfx::Rect& bounds, |
52 ui::WindowShowState show_state) override { | 53 ui::WindowShowState show_state) override { |
53 if (should_quit_on_size_change_ && last_size_ != bounds.size()) { | 54 if (should_quit_on_size_change_ && last_size_ != bounds.size()) { |
54 // Schedule message loop quit because we could be called while | 55 // Schedule message loop quit because we could be called while |
55 // the bounds change call is on the stack and not in the nested message | 56 // the bounds change call is on the stack and not in the nested message |
56 // loop. | 57 // loop. |
57 base::MessageLoop::current()->PostTask( | 58 base::MessageLoop::current()->task_runner()->PostTask( |
58 FROM_HERE, | 59 FROM_HERE, |
59 base::Bind(&base::MessageLoop::Quit, | 60 base::Bind(&base::MessageLoop::Quit, |
60 base::Unretained(base::MessageLoop::current()))); | 61 base::Unretained(base::MessageLoop::current()))); |
61 } | 62 } |
62 | 63 |
63 last_size_ = bounds.size(); | 64 last_size_ = bounds.size(); |
64 } | 65 } |
65 | 66 |
66 void OnDialogClosed(const std::string& json_retval) override { | 67 void OnDialogClosed(const std::string& json_retval) override { |
67 should_quit_on_size_change_ = false; // No quit when we are closing. | 68 should_quit_on_size_change_ = false; // No quit when we are closing. |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 view_->GetWidget()->widget_delegate()->GetModalType()); | 227 view_->GetWidget()->widget_delegate()->GetModalType()); |
227 | 228 |
228 // Close the parent window. Tear down may happen asynchronously. | 229 // Close the parent window. Tear down may happen asynchronously. |
229 EXPECT_FALSE(web_dialog_delegate_destroyed_); | 230 EXPECT_FALSE(web_dialog_delegate_destroyed_); |
230 EXPECT_FALSE(web_dialog_view_destroyed_); | 231 EXPECT_FALSE(web_dialog_view_destroyed_); |
231 browser()->window()->Close(); | 232 browser()->window()->Close(); |
232 content::RunAllPendingInMessageLoop(); | 233 content::RunAllPendingInMessageLoop(); |
233 EXPECT_TRUE(web_dialog_delegate_destroyed_); | 234 EXPECT_TRUE(web_dialog_delegate_destroyed_); |
234 EXPECT_TRUE(web_dialog_view_destroyed_); | 235 EXPECT_TRUE(web_dialog_view_destroyed_); |
235 } | 236 } |
OLD | NEW |