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

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

Issue 296003014: Revert 272217 "LanguageState should be owned by TranslateManager" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 <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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" 50 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
51 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 51 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
52 #include "chrome/browser/ui/tabs/tab_strip_model.h" 52 #include "chrome/browser/ui/tabs/tab_strip_model.h"
53 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
54 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 54 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
55 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
56 #include "chrome/common/url_constants.h" 56 #include "chrome/common/url_constants.h"
57 #include "chrome/test/base/in_process_browser_test.h" 57 #include "chrome/test/base/in_process_browser_test.h"
58 #include "chrome/test/base/test_switches.h" 58 #include "chrome/test/base/test_switches.h"
59 #include "chrome/test/base/ui_test_utils.h" 59 #include "chrome/test/base/ui_test_utils.h"
60 #include "components/translate/core/browser/language_state.h"
61 #include "components/translate/core/common/language_detection_details.h" 60 #include "components/translate/core/common/language_detection_details.h"
62 #include "content/public/browser/favicon_status.h" 61 #include "content/public/browser/favicon_status.h"
63 #include "content/public/browser/host_zoom_map.h" 62 #include "content/public/browser/host_zoom_map.h"
64 #include "content/public/browser/interstitial_page.h" 63 #include "content/public/browser/interstitial_page.h"
65 #include "content/public/browser/interstitial_page_delegate.h" 64 #include "content/public/browser/interstitial_page_delegate.h"
66 #include "content/public/browser/navigation_entry.h" 65 #include "content/public/browser/navigation_entry.h"
67 #include "content/public/browser/notification_service.h" 66 #include "content/public/browser/notification_service.h"
68 #include "content/public/browser/render_frame_host.h" 67 #include "content/public/browser/render_frame_host.h"
69 #include "content/public/browser/render_process_host.h" 68 #include "content/public/browser/render_process_host.h"
70 #include "content/public/browser/render_view_host.h" 69 #include "content/public/browser/render_view_host.h"
(...skipping 2616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2687 #endif 2686 #endif
2688 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2687 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2689 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2688 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2690 gfx::Size exp_final_size(initial_wcv_size); 2689 gfx::Size exp_final_size(initial_wcv_size);
2691 exp_final_size.Enlarge(wcv_resize_insets.width(), 2690 exp_final_size.Enlarge(wcv_resize_insets.width(),
2692 wcv_resize_insets.height() + height_inset); 2691 wcv_resize_insets.height() + height_inset);
2693 EXPECT_EQ(exp_final_size, 2692 EXPECT_EQ(exp_final_size,
2694 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2693 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2695 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2694 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2696 } 2695 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/translate/translate_tab_helper.cc ('k') | trunk/src/chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698