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

Side by Side Diff: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased on ToT, fix along with review comments Created 9 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
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/ui/touch/frame/touch_browser_frame_view.h" 5 #include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
6 6
7 #include "chrome/browser/ui/touch/animation/screen_rotation_setter.h" 7 #include "chrome/browser/ui/touch/animation/screen_rotation_setter.h"
8 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
9 #include "views/controls/button/image_button.h" 8 #include "views/controls/button/image_button.h"
10 #include "views/desktop/desktop_window_view.h" 9 #include "views/desktop/desktop_window_view.h"
11 #include "ui/gfx/transform.h" 10 #include "ui/gfx/transform.h"
12 11
13 namespace { 12 namespace {
14 13
15 ui::Transform SideToTransform(sensors::ScreenOrientation::Side side, 14 ui::Transform SideToTransform(sensors::ScreenOrientation::Side side,
16 const ui::Transform& old_transform, 15 const ui::Transform& old_transform,
17 const gfx::Size& size) { 16 const gfx::Size& size) {
18 gfx::Point origin; 17 gfx::Point origin;
(...skipping 30 matching lines...) Expand all
49 const char TouchBrowserFrameView::kViewClassName[] = 48 const char TouchBrowserFrameView::kViewClassName[] =
50 "browser/ui/touch/frame/TouchBrowserFrameView"; 49 "browser/ui/touch/frame/TouchBrowserFrameView";
51 50
52 /////////////////////////////////////////////////////////////////////////////// 51 ///////////////////////////////////////////////////////////////////////////////
53 // TouchBrowserFrameView, public: 52 // TouchBrowserFrameView, public:
54 53
55 TouchBrowserFrameView::TouchBrowserFrameView(BrowserFrame* frame, 54 TouchBrowserFrameView::TouchBrowserFrameView(BrowserFrame* frame,
56 BrowserView* browser_view) 55 BrowserView* browser_view)
57 : OpaqueBrowserFrameView(frame, browser_view), 56 : OpaqueBrowserFrameView(frame, browser_view),
58 initialized_screen_rotation_(false) { 57 initialized_screen_rotation_(false) {
59 // Make sure the singleton VirtualKeyboardManager object is initialized.
60 VirtualKeyboardManager::GetInstance();
61 sensors::Provider::GetInstance()->AddListener(this); 58 sensors::Provider::GetInstance()->AddListener(this);
62 } 59 }
63 60
64 TouchBrowserFrameView::~TouchBrowserFrameView() { 61 TouchBrowserFrameView::~TouchBrowserFrameView() {
65 sensors::Provider::GetInstance()->RemoveListener(this); 62 sensors::Provider::GetInstance()->RemoveListener(this);
66 } 63 }
67 64
68 std::string TouchBrowserFrameView::GetClassName() const { 65 std::string TouchBrowserFrameView::GetClassName() const {
69 return kViewClassName; 66 return kViewClassName;
70 } 67 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 initialized_screen_rotation_ = true; 106 initialized_screen_rotation_ = true;
110 } 107 }
111 108
112 const ui::Transform& old_xform = to_rotate->GetTransform(); 109 const ui::Transform& old_xform = to_rotate->GetTransform();
113 const ui::Transform& new_xform = SideToTransform(change.upward, 110 const ui::Transform& new_xform = SideToTransform(change.upward,
114 old_xform, 111 old_xform,
115 to_rotate->size()); 112 to_rotate->size());
116 if (old_xform != new_xform) 113 if (old_xform != new_xform)
117 to_rotate->SetTransform(new_xform); 114 to_rotate->SetTransform(new_xform);
118 } 115 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698