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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 297123002: API proposal for chrome.app.window to intercept all keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT Created 6 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/apps/chrome_native_app_window_views.h" 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
6 6
7 #include "apps/ui/views/app_window_frame_view.h" 7 #include "apps/ui/views/app_window_frame_view.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
11 #include "chrome/browser/chrome_page_zoom.h" 11 #include "chrome/browser/chrome_page_zoom.h"
12 #include "chrome/browser/favicon/favicon_tab_helper.h" 12 #include "chrome/browser/favicon/favicon_tab_helper.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/host_desktop.h" 14 #include "chrome/browser/ui/host_desktop.h"
15 #include "chrome/browser/ui/views/apps/desktop_keyboard_capture.h"
15 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" 16 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
16 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" 17 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"
17 #include "chrome/browser/ui/views/frame/taskbar_decorator.h" 18 #include "chrome/browser/ui/views/frame/taskbar_decorator.h"
18 #include "chrome/browser/ui/zoom/zoom_controller.h" 19 #include "chrome/browser/ui/zoom/zoom_controller.h"
19 #include "chrome/browser/web_applications/web_app.h" 20 #include "chrome/browser/web_applications/web_app.h"
20 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
21 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
22 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
23 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
24 #include "ui/base/models/simple_menu_model.h" 25 #include "ui/base/models/simple_menu_model.h"
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 } 678 }
678 679
679 SkColor ChromeNativeAppWindowViews::ActiveFrameColor() const { 680 SkColor ChromeNativeAppWindowViews::ActiveFrameColor() const {
680 return active_frame_color_; 681 return active_frame_color_;
681 } 682 }
682 683
683 SkColor ChromeNativeAppWindowViews::InactiveFrameColor() const { 684 SkColor ChromeNativeAppWindowViews::InactiveFrameColor() const {
684 return inactive_frame_color_; 685 return inactive_frame_color_;
685 } 686 }
686 687
688 void ChromeNativeAppWindowViews::SetInterceptAllKeys(bool want_all_keys) {
689 if (want_all_keys && (desktop_keyboard_capture_.get() == NULL)) {
690 desktop_keyboard_capture_.reset(new DesktopKeyboardCapture(widget()));
691 } else if (!want_all_keys) {
692 desktop_keyboard_capture_.reset(NULL);
693 }
694 }
695
687 // NativeAppWindowViews implementation. 696 // NativeAppWindowViews implementation.
688 697
689 void ChromeNativeAppWindowViews::InitializeWindow( 698 void ChromeNativeAppWindowViews::InitializeWindow(
690 AppWindow* app_window, 699 AppWindow* app_window,
691 const AppWindow::CreateParams& create_params) { 700 const AppWindow::CreateParams& create_params) {
692 DCHECK(widget()); 701 DCHECK(widget());
693 has_frame_color_ = create_params.has_frame_color; 702 has_frame_color_ = create_params.has_frame_color;
694 active_frame_color_ = create_params.active_frame_color; 703 active_frame_color_ = create_params.active_frame_color;
695 inactive_frame_color_ = create_params.inactive_frame_color; 704 inactive_frame_color_ = create_params.inactive_frame_color;
696 if (create_params.window_type == AppWindow::WINDOW_TYPE_PANEL || 705 if (create_params.window_type == AppWindow::WINDOW_TYPE_PANEL ||
697 create_params.window_type == AppWindow::WINDOW_TYPE_V1_PANEL) { 706 create_params.window_type == AppWindow::WINDOW_TYPE_V1_PANEL) {
698 InitializePanelWindow(create_params); 707 InitializePanelWindow(create_params);
699 } else { 708 } else {
700 InitializeDefaultWindow(create_params); 709 InitializeDefaultWindow(create_params);
701 } 710 }
702 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( 711 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
703 Profile::FromBrowserContext(app_window->browser_context()), 712 Profile::FromBrowserContext(app_window->browser_context()),
704 widget()->GetFocusManager(), 713 widget()->GetFocusManager(),
705 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, 714 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
706 NULL)); 715 NULL));
707 } 716 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views.h ('k') | chrome/browser/ui/views/apps/desktop_keyboard_capture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698