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 <algorithm> | 5 #include <algorithm> |
6 #include <set> | 6 #include <set> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 DISALLOW_COPY_AND_ASSIGN(MockTranslateBubbleFactory); | 365 DISALLOW_COPY_AND_ASSIGN(MockTranslateBubbleFactory); |
366 }; | 366 }; |
367 | 367 |
368 namespace { | 368 namespace { |
369 | 369 |
370 class TestRenderViewContextMenu : public RenderViewContextMenu { | 370 class TestRenderViewContextMenu : public RenderViewContextMenu { |
371 public: | 371 public: |
372 static TestRenderViewContextMenu* CreateContextMenu( | 372 static TestRenderViewContextMenu* CreateContextMenu( |
373 content::WebContents* web_contents) { | 373 content::WebContents* web_contents) { |
374 content::ContextMenuParams params; | 374 content::ContextMenuParams params; |
375 params.media_type = WebKit::WebContextMenuData::MediaTypeNone; | 375 params.media_type = blink::WebContextMenuData::MediaTypeNone; |
376 params.x = 0; | 376 params.x = 0; |
377 params.y = 0; | 377 params.y = 0; |
378 params.has_image_contents = true; | 378 params.has_image_contents = true; |
379 params.media_flags = 0; | 379 params.media_flags = 0; |
380 params.spellcheck_enabled = false; | 380 params.spellcheck_enabled = false; |
381 params.is_editable = false; | 381 params.is_editable = false; |
382 params.page_url = web_contents->GetController().GetActiveEntry()->GetURL(); | 382 params.page_url = web_contents->GetController().GetActiveEntry()->GetURL(); |
383 #if defined(OS_MACOSX) | 383 #if defined(OS_MACOSX) |
384 params.writing_direction_default = 0; | 384 params.writing_direction_default = 0; |
385 params.writing_direction_left_to_right = 0; | 385 params.writing_direction_left_to_right = 0; |
386 params.writing_direction_right_to_left = 0; | 386 params.writing_direction_right_to_left = 0; |
387 #endif // OS_MACOSX | 387 #endif // OS_MACOSX |
388 params.edit_flags = WebKit::WebContextMenuData::CanTranslate; | 388 params.edit_flags = blink::WebContextMenuData::CanTranslate; |
389 return new TestRenderViewContextMenu(web_contents, params); | 389 return new TestRenderViewContextMenu(web_contents, params); |
390 } | 390 } |
391 | 391 |
392 bool IsItemPresent(int id) { | 392 bool IsItemPresent(int id) { |
393 return menu_model_.GetIndexOfCommandId(id) != -1; | 393 return menu_model_.GetIndexOfCommandId(id) != -1; |
394 } | 394 } |
395 | 395 |
396 virtual void PlatformInit() OVERRIDE { } | 396 virtual void PlatformInit() OVERRIDE { } |
397 virtual void PlatformCancel() OVERRIDE { } | 397 virtual void PlatformCancel() OVERRIDE { } |
398 virtual bool GetAcceleratorForCommandId( | 398 virtual bool GetAcceleratorForCommandId( |
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1604 content::WebContents* current_web_contents = | 1604 content::WebContents* current_web_contents = |
1605 browser()->tab_strip_model()->GetActiveWebContents(); | 1605 browser()->tab_strip_model()->GetActiveWebContents(); |
1606 content::Source<content::WebContents> source(current_web_contents); | 1606 content::Source<content::WebContents> source(current_web_contents); |
1607 | 1607 |
1608 ui_test_utils::WindowedNotificationObserverWithDetails< | 1608 ui_test_utils::WindowedNotificationObserverWithDetails< |
1609 LanguageDetectionDetails> | 1609 LanguageDetectionDetails> |
1610 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 1610 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
1611 source); | 1611 source); |
1612 fr_language_detected_signal.Wait(); | 1612 fr_language_detected_signal.Wait(); |
1613 } | 1613 } |
OLD | NEW |