content/shell/browser/shell_views.cc - Issue 205253003: [master] x11: Move X event handling out of the message-pump.

Side by Side Diff: content/shell/browser/shell_views.cc

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix-merge Created 6 years, 8 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

« no previous file with comments | « chrome/test/base/view_event_test_base.cc ('k') | mojo/services/native_viewport/native_viewport_x11.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/shell/browser/shell.h"	5 #include "content/shell/browser/shell.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "content/public/browser/render_widget_host_view.h"	9 #include "content/public/browser/render_widget_host_view.h"

10 #include "content/public/browser/web_contents.h"	10 #include "content/public/browser/web_contents.h"

11 #include "content/public/browser/web_contents_view.h"	11 #include "content/public/browser/web_contents_view.h"

12 #include "content/public/common/context_menu_params.h"	12 #include "content/public/common/context_menu_params.h"

13 #include "content/shell/browser/shell_platform_data_aura.h"	13 #include "content/shell/browser/shell_platform_data_aura.h"

14 #include "ui/aura/client/screen_position_client.h"	14 #include "ui/aura/client/screen_position_client.h"

15 #include "ui/aura/env.h"	15 #include "ui/aura/env.h"

16 #include "ui/aura/window.h"	16 #include "ui/aura/window.h"

17 #include "ui/aura/window_event_dispatcher.h"	17 #include "ui/aura/window_event_dispatcher.h"

18 #include "ui/base/clipboard/clipboard.h"	18 #include "ui/base/clipboard/clipboard.h"

19 #include "ui/base/models/simple_menu_model.h"	19 #include "ui/base/models/simple_menu_model.h"

20 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/events/event.h"	21 #include "ui/events/event.h"

	22 #include "ui/events/platform/platform_event_source.h"

22 #include "ui/gfx/screen.h"	23 #include "ui/gfx/screen.h"

23 #include "ui/views/background.h"	24 #include "ui/views/background.h"

24 #include "ui/views/controls/button/label_button.h"	25 #include "ui/views/controls/button/label_button.h"

25 #include "ui/views/controls/button/menu_button.h"	26 #include "ui/views/controls/button/menu_button.h"

26 #include "ui/views/controls/button/menu_button_listener.h"	27 #include "ui/views/controls/button/menu_button_listener.h"

27 #include "ui/views/controls/menu/menu_item_view.h"	28 #include "ui/views/controls/menu/menu_item_view.h"

28 #include "ui/views/controls/menu/menu_runner.h"	29 #include "ui/views/controls/menu/menu_runner.h"

29 #include "ui/views/controls/textfield/textfield.h"	30 #include "ui/views/controls/textfield/textfield.h"

30 #include "ui/views/controls/textfield/textfield_controller.h"	31 #include "ui/views/controls/textfield/textfield_controller.h"

31 #include "ui/views/controls/webview/webview.h"	32 #include "ui/views/controls/webview/webview.h"

(...skipping 529 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
561	562

562 void Shell::PlatformWebContentsFocused(WebContents* contents) {	563 void Shell::PlatformWebContentsFocused(WebContents* contents) {

563 if (headless_)	564 if (headless_)

564 return;	565 return;

565 ShellWindowDelegateView* delegate_view =	566 ShellWindowDelegateView* delegate_view =

566 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());	567 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());

567 delegate_view->OnWebContentsFocused(contents);	568 delegate_view->OnWebContentsFocused(contents);

568 }	569 }

569	570

570 } // namespace content	571 } // namespace content

OLD	NEW