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

Side by Side Diff: ash/shell.h

Issue 25111002: Only show virtual keyboard on primary root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 namespace content { 43 namespace content {
44 class BrowserContext; 44 class BrowserContext;
45 } 45 }
46 46
47 namespace gfx { 47 namespace gfx {
48 class ImageSkia; 48 class ImageSkia;
49 class Point; 49 class Point;
50 class Rect; 50 class Rect;
51 } 51 }
52
53 namespace keyboard {
54 class KeyboardController;
55 }
56
52 namespace ui { 57 namespace ui {
53 class Layer; 58 class Layer;
54 } 59 }
55 namespace views { 60 namespace views {
56 class NonClientFrameView; 61 class NonClientFrameView;
57 class Widget; 62 class Widget;
58 namespace corewm { 63 namespace corewm {
59 class CompoundEventFilter; 64 class CompoundEventFilter;
60 class InputMethodEventFilter; 65 class InputMethodEventFilter;
61 class ShadowController; 66 class ShadowController;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // Initializes |launcher_|. Does nothing if it's already initialized. 274 // Initializes |launcher_|. Does nothing if it's already initialized.
270 void CreateLauncher(); 275 void CreateLauncher();
271 276
272 // Show launcher view if it was created hidden (before session has started). 277 // Show launcher view if it was created hidden (before session has started).
273 void ShowLauncher(); 278 void ShowLauncher();
274 279
275 // Adds/removes observer. 280 // Adds/removes observer.
276 void AddShellObserver(ShellObserver* observer); 281 void AddShellObserver(ShellObserver* observer);
277 void RemoveShellObserver(ShellObserver* observer); 282 void RemoveShellObserver(ShellObserver* observer);
278 283
284 keyboard::KeyboardController* keyboard_controller() {
285 return keyboard_controller_.get();
286 }
287
279 AcceleratorController* accelerator_controller() { 288 AcceleratorController* accelerator_controller() {
280 return accelerator_controller_.get(); 289 return accelerator_controller_.get();
281 } 290 }
282 291
283 internal::DisplayManager* display_manager() { 292 internal::DisplayManager* display_manager() {
284 return display_manager_.get(); 293 return display_manager_.get();
285 } 294 }
286 views::corewm::InputMethodEventFilter* input_method_filter() { 295 views::corewm::InputMethodEventFilter* input_method_filter() {
287 return input_method_filter_.get(); 296 return input_method_filter_.get();
288 } 297 }
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 friend class shell::WindowWatcher; 504 friend class shell::WindowWatcher;
496 505
497 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 506 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
498 507
499 // Takes ownership of |delegate|. 508 // Takes ownership of |delegate|.
500 explicit Shell(ShellDelegate* delegate); 509 explicit Shell(ShellDelegate* delegate);
501 virtual ~Shell(); 510 virtual ~Shell();
502 511
503 void Init(); 512 void Init();
504 513
514 // Initializes virtual keyboard controller and attaches it to |root|.
515 void InitKeyboard(internal::RootWindowController* root);
516
505 // Initializes the root window and root window controller so that it 517 // Initializes the root window and root window controller so that it
506 // can host browser windows. |first_run_after_boot| is true for the 518 // can host browser windows. |first_run_after_boot| is true for the
507 // primary display only first time after boot. 519 // primary display only first time after boot.
508 void InitRootWindowController(internal::RootWindowController* root, 520 void InitRootWindowController(internal::RootWindowController* root,
509 bool first_run_after_boot); 521 bool first_run_after_boot);
510 522
511 // ash::internal::SystemModalContainerEventFilterDelegate overrides: 523 // ash::internal::SystemModalContainerEventFilterDelegate overrides:
512 virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; 524 virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE;
513 525
514 // Overridden from ui::EventTarget: 526 // Overridden from ui::EventTarget:
(...skipping 18 matching lines...) Expand all
533 // which case they are created on |target_root_window_|. 545 // which case they are created on |target_root_window_|.
534 // |target_root_window_| never becomes NULL during the session. 546 // |target_root_window_| never becomes NULL during the session.
535 aura::RootWindow* target_root_window_; 547 aura::RootWindow* target_root_window_;
536 aura::RootWindow* scoped_target_root_window_; 548 aura::RootWindow* scoped_target_root_window_;
537 549
538 // The CompoundEventFilter owned by aura::Env object. 550 // The CompoundEventFilter owned by aura::Env object.
539 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_; 551 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_;
540 552
541 std::vector<WindowAndBoundsPair> to_restore_; 553 std::vector<WindowAndBoundsPair> to_restore_;
542 554
555 scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
543 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 556 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
544 scoped_ptr<AcceleratorController> accelerator_controller_; 557 scoped_ptr<AcceleratorController> accelerator_controller_;
545 scoped_ptr<ShellDelegate> delegate_; 558 scoped_ptr<ShellDelegate> delegate_;
546 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 559 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
547 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 560 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
548 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 561 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
549 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 562 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
550 scoped_ptr<SessionStateDelegate> session_state_delegate_; 563 scoped_ptr<SessionStateDelegate> session_state_delegate_;
551 scoped_ptr<LauncherDelegate> launcher_delegate_; 564 scoped_ptr<LauncherDelegate> launcher_delegate_;
552 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_; 565 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 bool simulate_modal_window_open_for_testing_; 654 bool simulate_modal_window_open_for_testing_;
642 655
643 bool is_touch_hud_projection_enabled_; 656 bool is_touch_hud_projection_enabled_;
644 657
645 DISALLOW_COPY_AND_ASSIGN(Shell); 658 DISALLOW_COPY_AND_ASSIGN(Shell);
646 }; 659 };
647 660
648 } // namespace ash 661 } // namespace ash
649 662
650 #endif // ASH_SHELL_H_ 663 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698