OLD | NEW |
---|---|
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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 2369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2380 } | 2380 } |
2381 | 2381 |
2382 void RenderWidgetHostViewAura::Shutdown() { | 2382 void RenderWidgetHostViewAura::Shutdown() { |
2383 if (!in_shutdown_) { | 2383 if (!in_shutdown_) { |
2384 in_shutdown_ = true; | 2384 in_shutdown_ = true; |
2385 host_->Shutdown(); | 2385 host_->Shutdown(); |
2386 } | 2386 } |
2387 } | 2387 } |
2388 | 2388 |
2389 bool RenderWidgetHostViewAura::NeedsInputGrab() { | 2389 bool RenderWidgetHostViewAura::NeedsInputGrab() { |
2390 return popup_type_ == blink::WebPopupTypeSelect; | 2390 return popup_type_ == blink::WebPopupTypeSelect |
2391 || popup_type_ == blink::WebPopupTypePage; | |
sadrul
2015/03/23 07:05:38
I think the style-guide suggests the || at the EOL
tkent
2015/03/23 07:08:40
You're right. 'git cl format' corrected this erro
| |
2391 } | 2392 } |
2392 | 2393 |
2393 bool RenderWidgetHostViewAura::NeedsMouseCapture() { | 2394 bool RenderWidgetHostViewAura::NeedsMouseCapture() { |
2394 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 2395 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
2395 return NeedsInputGrab(); | 2396 return NeedsInputGrab(); |
2396 #endif | 2397 #endif |
2397 return false; | 2398 return false; |
2398 } | 2399 } |
2399 | 2400 |
2400 void RenderWidgetHostViewAura::FinishImeCompositionSession() { | 2401 void RenderWidgetHostViewAura::FinishImeCompositionSession() { |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2713 | 2714 |
2714 //////////////////////////////////////////////////////////////////////////////// | 2715 //////////////////////////////////////////////////////////////////////////////// |
2715 // RenderWidgetHostViewBase, public: | 2716 // RenderWidgetHostViewBase, public: |
2716 | 2717 |
2717 // static | 2718 // static |
2718 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2719 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2719 GetScreenInfoForWindow(results, NULL); | 2720 GetScreenInfoForWindow(results, NULL); |
2720 } | 2721 } |
2721 | 2722 |
2722 } // namespace content | 2723 } // namespace content |
OLD | NEW |