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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log
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 "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "base/win/windows_version.h" 13 #include "base/win/windows_version.h"
14 #endif 14 #endif
15 #include "content/browser/frame_host/navigation_controller_impl.h" 15 #include "content/browser/frame_host/navigation_controller_impl.h"
16 #include "content/browser/frame_host/navigation_entry_impl.h" 16 #include "content/browser/frame_host/navigation_entry_impl.h"
17 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h" 17 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h"
18 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
19 #include "content/browser/web_contents/web_contents_impl.h" 19 #include "content/browser/web_contents/web_contents_impl.h"
20 #include "content/public/browser/web_contents_observer.h" 20 #include "content/public/browser/web_contents_observer.h"
21 #include "content/public/browser/web_contents_view.h" 21 #include "content/public/browser/web_contents_view.h"
22 #include "content/public/common/content_switches.h" 22 #include "content/public/common/content_switches.h"
23 #include "content/public/test/browser_test_utils.h" 23 #include "content/public/test/browser_test_utils.h"
24 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "content/shell/browser/shell.h" 25 #include "content/shell/browser/shell.h"
26 #include "content/test/content_browser_test.h" 26 #include "content/test/content_browser_test.h"
27 #include "content/test/content_browser_test_utils.h" 27 #include "content/test/content_browser_test_utils.h"
28 #include "ui/aura/root_window.h"
29 #include "ui/aura/test/event_generator.h" 28 #include "ui/aura/test/event_generator.h"
30 #include "ui/aura/window.h" 29 #include "ui/aura/window.h"
30 #include "ui/aura/window_event_dispatcher.h"
31 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 31 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
32 32
33 namespace content { 33 namespace content {
34 34
35 // This class keeps track of the RenderViewHost whose screenshot was captured. 35 // This class keeps track of the RenderViewHost whose screenshot was captured.
36 class ScreenshotTracker : public NavigationEntryScreenshotManager { 36 class ScreenshotTracker : public NavigationEntryScreenshotManager {
37 public: 37 public:
38 explicit ScreenshotTracker(NavigationControllerImpl* controller) 38 explicit ScreenshotTracker(NavigationControllerImpl* controller)
39 : NavigationEntryScreenshotManager(controller), 39 : NavigationEntryScreenshotManager(controller),
40 screenshot_taken_for_(NULL), 40 screenshot_taken_for_(NULL),
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 10); 658 10);
659 base::string16 actual_title = title_watcher.WaitAndGetTitle(); 659 base::string16 actual_title = title_watcher.WaitAndGetTitle();
660 EXPECT_EQ(expected_title, actual_title); 660 EXPECT_EQ(expected_title, actual_title);
661 661
662 EXPECT_EQ(2, GetCurrentIndex()); 662 EXPECT_EQ(2, GetCurrentIndex());
663 EXPECT_TRUE(controller.CanGoBack()); 663 EXPECT_TRUE(controller.CanGoBack());
664 EXPECT_FALSE(controller.CanGoForward()); 664 EXPECT_FALSE(controller.CanGoForward());
665 } 665 }
666 666
667 } // namespace content 667 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698