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

Side by Side Diff: chrome/browser/extensions/api/app_window/app_window_api.cc

Issue 89873002: Ensure that the OSK on Windows 8 shows up when we tap on an editable field in any WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | 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 #include "chrome/browser/extensions/api/app_window/app_window_api.h" 5 #include "chrome/browser/extensions/api/app_window/app_window_api.h"
6 6
7 #include "apps/app_window_contents.h" 7 #include "apps/app_window_contents.h"
8 #include "apps/shell_window.h" 8 #include "apps/shell_window.h"
9 #include "apps/shell_window_registry.h" 9 #include "apps/shell_window_registry.h"
10 #include "apps/ui/native_app_window.h" 10 #include "apps/ui/native_app_window.h"
(...skipping 18 matching lines...) Expand all
29 #include "ui/base/ui_base_types.h" 29 #include "ui/base/ui_base_types.h"
30 #include "ui/gfx/rect.h" 30 #include "ui/gfx/rect.h"
31 #include "url/gurl.h" 31 #include "url/gurl.h"
32 32
33 #if defined(USE_ASH) 33 #if defined(USE_ASH)
34 #include "ash/shell.h" 34 #include "ash/shell.h"
35 #include "ui/aura/root_window.h" 35 #include "ui/aura/root_window.h"
36 #include "ui/aura/window.h" 36 #include "ui/aura/window.h"
37 #endif 37 #endif
38 38
39 #if defined(OS_WIN)
40 #include "chrome/browser/ui/touch_web_contents_observer_win.h"
41 #endif
42
39 using apps::ShellWindow; 43 using apps::ShellWindow;
40 44
41 namespace app_window = extensions::api::app_window; 45 namespace app_window = extensions::api::app_window;
42 namespace Create = app_window::Create; 46 namespace Create = app_window::Create;
43 47
44 namespace extensions { 48 namespace extensions {
45 49
46 namespace app_window_constants { 50 namespace app_window_constants {
47 const char kInvalidWindowId[] = 51 const char kInvalidWindowId[] =
48 "The window id can not be more than 256 characters long."; 52 "The window id can not be more than 256 characters long.";
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 view_id = created_view->GetRoutingID(); 331 view_id = created_view->GetRoutingID();
328 332
329 base::DictionaryValue* result = new base::DictionaryValue; 333 base::DictionaryValue* result = new base::DictionaryValue;
330 result->Set("viewId", new base::FundamentalValue(view_id)); 334 result->Set("viewId", new base::FundamentalValue(view_id));
331 result->Set("injectTitlebar", 335 result->Set("injectTitlebar",
332 new base::FundamentalValue(inject_html_titlebar)); 336 new base::FundamentalValue(inject_html_titlebar));
333 result->Set("id", new base::StringValue(shell_window->window_key())); 337 result->Set("id", new base::StringValue(shell_window->window_key()));
334 SetCreateResultFromShellWindow(shell_window, result); 338 SetCreateResultFromShellWindow(shell_window, result);
335 SetResult(result); 339 SetResult(result);
336 340
341 #if defined(OS_WIN)
342 TouchWebContentsObserver::CreateForWebContents(shell_window->web_contents());
343 #endif
344
337 if (apps::ShellWindowRegistry::Get(GetProfile()) 345 if (apps::ShellWindowRegistry::Get(GetProfile())
338 ->HadDevToolsAttached(created_view)) { 346 ->HadDevToolsAttached(created_view)) {
339 new DevToolsRestorer(this, created_view); 347 new DevToolsRestorer(this, created_view);
340 return true; 348 return true;
341 } 349 }
342 350
343 SendResponse(true); 351 SendResponse(true);
344 return true; 352 return true;
345 } 353 }
346 354
347 } // namespace extensions 355 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698