chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

Side by Side Diff: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 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

« no previous file with comments | « chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc ('k') | chrome/browser/ui/window_snapshot/window_snapshot_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"	5 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"

6	6

7 #include "base/json/json_writer.h"	7 #include "base/json/json_writer.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/extensions/extension_event_router.h"	9 #include "chrome/browser/extensions/extension_event_router.h"

10 #include "chrome/browser/extensions/extension_function_dispatcher.h"	10 #include "chrome/browser/extensions/extension_function_dispatcher.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

13 #include "chrome/browser/tabs/tab_strip_model.h"	13 #include "chrome/browser/tabs/tab_strip_model.h"

14 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

17 #include "chrome/browser/ui/views/frame/browser_view.h"	17 #include "chrome/browser/ui/views/frame/browser_view.h"

18 #include "chrome/common/chrome_notification_types.h"	18 #include "chrome/common/chrome_notification_types.h"

19 #include "chrome/common/extensions/extension_messages.h"	19 #include "chrome/common/extensions/extension_messages.h"

20 #include "chrome/common/url_constants.h"	20 #include "chrome/common/url_constants.h"

21 #include "content/public/browser/notification_service.h"	21 #include "content/public/browser/notification_service.h"

22 #include "content/public/browser/site_instance.h"	22 #include "content/public/browser/site_instance.h"

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

24 #include "content/public/browser/web_contents_observer.h"	24 #include "content/public/browser/web_contents_observer.h"

25 #include "ui/base/animation/animation_delegate.h"	25 #include "ui/base/animation/animation_delegate.h"

26 #include "ui/base/animation/slide_animation.h"	26 #include "ui/base/animation/slide_animation.h"

27 #include "ui/base/ime/text_input_type.h"	27 #include "ui/base/ime/text_input_type.h"

28 #include "ui/gfx/compositor/layer.h"	28 #include "ui/compositor/layer.h"

29 #include "ui/gfx/screen.h"	29 #include "ui/gfx/screen.h"

30 #include "ui/views/controls/webview/webview.h"	30 #include "ui/views/controls/webview/webview.h"

31 #include "ui/views/ime/text_input_type_tracker.h"	31 #include "ui/views/ime/text_input_type_tracker.h"

32 #include "ui/views/widget/widget.h"	32 #include "ui/views/widget/widget.h"

33	33

34 #if defined(OS_CHROMEOS)	34 #if defined(OS_CHROMEOS)

35 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	35 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

36 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"	36 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"

37 #endif	37 #endif

38	38

(...skipping 488 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
527	527

528 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) {	528 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) {

529 DCHECK_EQ(keyboard_, widget);	529 DCHECK_EQ(keyboard_, widget);

530 keyboard_ = NULL;	530 keyboard_ = NULL;

531 }	531 }

532	532

533 // static	533 // static

534 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {	534 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {

535 return Singleton<VirtualKeyboardManager>::get();	535 return Singleton<VirtualKeyboardManager>::get();

536 }	536 }

OLD	NEW