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

Side by Side Diff: chrome/browser/extensions/extension_input_api.cc

Issue 8423008: Fixed touch build after 8395042. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: get rid of GTK_WINDOW Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/chromeos/setting_level_bubble.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extension_input_api.h" 5 #include "chrome/browser/extensions/extension_input_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/key_identifier_conversion_views.h" 12 #include "chrome/browser/extensions/key_identifier_conversion_views.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 15 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "views/events/event.h" 17 #include "views/events/event.h"
18 #include "views/ime/input_method.h" 18 #include "views/ime/input_method.h"
19 #include "views/views_delegate.h" 19 #include "views/views_delegate.h"
20 #include "views/widget/widget.h" 20 #include "views/widget/widget.h"
21 21
22 #if defined(USE_VIRTUAL_KEYBOARD) 22 #if defined(USE_VIRTUAL_KEYBOARD)
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #endif 24 #endif
25 25
26 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 26 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
27 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 27 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
28 #include "chrome/browser/chromeos/input_method/ibus_controller.h" 28 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
29 #include "chrome/browser/chromeos/login/webui_login_display.h" 29 #include "chrome/browser/chromeos/login/base_login_display_host.h"
30 #endif 30 #endif
31 31
32 namespace { 32 namespace {
33 33
34 // Keys. 34 // Keys.
35 const char kType[] = "type"; 35 const char kType[] = "type";
36 const char kKeyIdentifier[] = "keyIdentifier"; 36 const char kKeyIdentifier[] = "keyIdentifier";
37 const char kAlt[] = "altKey"; 37 const char kAlt[] = "altKey";
38 const char kCtrl[] = "ctrlKey"; 38 const char kCtrl[] = "ctrlKey";
39 const char kMeta[] = "metaKey"; 39 const char kMeta[] = "metaKey";
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 views::Widget* GetTopLevelWidget(Browser* browser) { 76 views::Widget* GetTopLevelWidget(Browser* browser) {
77 if (views::ViewsDelegate::views_delegate) { 77 if (views::ViewsDelegate::views_delegate) {
78 views::View* view = views::ViewsDelegate::views_delegate-> 78 views::View* view = views::ViewsDelegate::views_delegate->
79 GetDefaultParentView(); 79 GetDefaultParentView();
80 if (view) 80 if (view)
81 return view->GetWidget(); 81 return view->GetWidget();
82 } 82 }
83 83
84 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 84 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
85 views::Widget* login_window = chromeos::WebUILoginDisplay::GetLoginWindow(); 85 chromeos::LoginDisplayHost* host =
86 if (login_window) 86 chromeos::BaseLoginDisplayHost::default_host();
87 return login_window; 87 if (host)
88 return views::Widget::GetWidgetForNativeWindow(host->GetNativeWindow());
88 #endif 89 #endif
89 90
90 if (!browser) 91 if (!browser)
91 return NULL; 92 return NULL;
92 93
93 BrowserWindow* window = browser->window(); 94 BrowserWindow* window = browser->window();
94 if (!window) 95 if (!window)
95 return NULL; 96 return NULL;
96 97
97 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); 98 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 int stroke_count = 0; // zero means 'clear all strokes'. 236 int stroke_count = 0; // zero means 'clear all strokes'.
236 if (HasOptionalArgument(0)) { 237 if (HasOptionalArgument(0)) {
237 EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &stroke_count)); 238 EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &stroke_count));
238 EXTENSION_FUNCTION_VALIDATE(stroke_count >= 0); 239 EXTENSION_FUNCTION_VALIDATE(stroke_count >= 0);
239 } 240 }
240 chromeos::input_method::InputMethodManager::GetInstance()-> 241 chromeos::input_method::InputMethodManager::GetInstance()->
241 CancelHandwritingStrokes(stroke_count); 242 CancelHandwritingStrokes(stroke_count);
242 return true; 243 return true;
243 } 244 }
244 #endif 245 #endif
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/setting_level_bubble.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698