Fixing french keyboard handling

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 224 matching lines @@
 void AcceleratorController::Unregister(const ui::Accelerator& accelerator,
                                        ui::AcceleratorTarget* target) {
   accelerator_manager_->Unregister(accelerator, target);
 }
 
 void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
   accelerator_manager_->UnregisterAll(target);
 }
 
 bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
+  if (ime_control_delegate_.get()) {
+    return accelerator_manager_->Process(
+               ime_control_delegate_->RemapAccelerator(accelerator));

[Daniel Erat, 2012/05/30 15:58:27]

nit: indent this four spaces beyond the previous line rather than eleven

[Mr4D (OOO till 08-26), 2012/05/30 16:21:31]

Moment. We have *always* 4 spaces - ignoring *any* context of where the
arguments belong to? (in contrast to g3 styleguide)? That makes it hard to read.
Okay, you got it, but this style is .. not great.

[Daniel Erat, 2012/05/30 16:54:06]

I'm not aware of anything in google3 that says to start counting the four spaces
after the return statement.  All I see is
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Functi....

"git grep -A 1 'return .*($' | less" makes it pretty clear that Chrome uses
four-space indents in this case.  When I did the same search across google3
using cs/ and randomly looked at ten examples, one of them indented beyond the
return but all of the others just used four-space indents.

[Mr4D (OOO till 08-26), 2012/05/30 17:37:17]

Even though it doesn't change anything, here is an example from the styleguide:
http://www.corp.google.com/eng/doc/cppguide.xml?showone=Default_Arguments#Def...
If I remember correctly the 4 chars in was only the last resort when it does not
fit the (80 chars) line otherwise. Otherwise indenting to bracket level has to
be done. (which makes a lot of sense for readability). Oh well.
(I don't want to discuss differences in style guide here)

[Daniel Erat, 2012/05/30 17:51:05]

For the sake of argument ( :-) ), that example doesn't seem to apply here, as
you don't have enough room to indent to opening bracket/parenthesis.  I think
that
http://www.corp.google.com/eng/doc/cppguide.xml?showone=Default_Arguments#Fun...
is what you're referring to, but it say anything beyond "4 space indent" for the
case where it doesn't fit.

[Mr4D (OOO till 08-26), 2012/05/30 18:09:46]

:) In the past there was a rule to indent first bracket style and then 4 chars
if not enough space is there otherwise. Somehow I think that searching for it
wouldn't change anything and maybe the rule got even changed. So there is a new
rule.

+  }
   return accelerator_manager_->Process(accelerator);
 }
 
 bool AcceleratorController::IsRegistered(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
 }
 
 void AcceleratorController::SetBrightnessControlDelegate(
     scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) {
@@ skipping 279 matching lines @@
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash