summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/accelerators/accelerator_table_unittest.cc4
-rw-r--r--athena/input/accelerator_manager_impl.cc2
-rw-r--r--athena/input/public/accelerator_manager.h2
-rw-r--r--chrome/browser/ui/panels/panel_browsertest.cc2
-rw-r--r--chrome/browser/ui/views/accelerator_table_unittest.cc10
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_views.cc2
-rw-r--r--chrome/browser/ui/views/panels/panel_view.cc2
-rw-r--r--ui/accelerometer/accelerometer_types.h8
-rw-r--r--ui/base/accelerators/accelerator_manager.h2
-rw-r--r--ui/base/models/menu_model.h2
-rw-r--r--ui/views/focus/focus_manager.h2
11 files changed, 19 insertions, 19 deletions
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc
index ec71f41..b04c579 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -27,10 +27,10 @@ struct Cmp {
} // namespace
TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
- std::set<AcceleratorData, Cmp> acclerators;
+ std::set<AcceleratorData, Cmp> accelerators;
for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
const AcceleratorData& entry = kAcceleratorData[i];
- EXPECT_TRUE(acclerators.insert(entry).second)
+ EXPECT_TRUE(accelerators.insert(entry).second)
<< "Duplicated accelerator: " << entry.trigger_on_press << ", "
<< entry.keycode << ", " << (entry.modifiers & ui::EF_SHIFT_DOWN)
<< ", " << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
diff --git a/athena/input/accelerator_manager_impl.cc b/athena/input/accelerator_manager_impl.cc
index fb0a2d3..ad03023 100644
--- a/athena/input/accelerator_manager_impl.cc
+++ b/athena/input/accelerator_manager_impl.cc
@@ -33,7 +33,7 @@ class AcceleratorManagerImpl::AcceleratorWrapper {
ui::AcceleratorTarget* target) = 0;
virtual bool Process(const ui::Accelerator& accelerator) = 0;
virtual ui::AcceleratorTarget* GetCurrentTarget(
- const ui::Accelerator& accelertor) const = 0;
+ const ui::Accelerator& accelerator) const = 0;
};
namespace {
diff --git a/athena/input/public/accelerator_manager.h b/athena/input/public/accelerator_manager.h
index d169a3c..adc44bf 100644
--- a/athena/input/public/accelerator_manager.h
+++ b/athena/input/public/accelerator_manager.h
@@ -60,7 +60,7 @@ class ATHENA_EXPORT AcceleratorHandler {
class ATHENA_EXPORT AcceleratorManager {
public:
- // Returns an AccelerarManager for global acelerators.
+ // Returns an AcceleratorManager for global accelerators.
static AcceleratorManager* Get();
// Creates an AcceleratorManager for application windows that
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 7bdcd55..3a6fe89 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1689,7 +1689,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_Accelerator) {
Panel* panel = CreatePanelWithParams(params);
EXPECT_EQ(1, panel_manager->num_panels());
- // Close the panel by acclerator.
+ // Close the panel by accelerator.
content::WindowedNotificationObserver signal(
chrome::NOTIFICATION_PANEL_CLOSED,
content::Source<Panel>(panel));
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc
index 00c7436..38db3cd 100644
--- a/chrome/browser/ui/views/accelerator_table_unittest.cc
+++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -30,12 +30,12 @@ struct Cmp {
} // namespace
TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
- std::set<AcceleratorMapping, Cmp> acclerators;
+ std::set<AcceleratorMapping, Cmp> accelerators;
const std::vector<AcceleratorMapping> accelerator_list(GetAcceleratorList());
for (std::vector<AcceleratorMapping>::const_iterator it =
accelerator_list.begin(); it != accelerator_list.end(); ++it) {
const AcceleratorMapping& entry = *it;
- EXPECT_TRUE(acclerators.insert(entry).second)
+ EXPECT_TRUE(accelerators.insert(entry).second)
<< "Duplicated accelerator: " << entry.keycode << ", "
<< (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
<< (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
@@ -45,12 +45,12 @@ TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
#if defined(OS_CHROMEOS)
TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
- std::set<AcceleratorMapping, Cmp> acclerators;
+ std::set<AcceleratorMapping, Cmp> accelerators;
const std::vector<AcceleratorMapping> accelerator_list(GetAcceleratorList());
for (std::vector<AcceleratorMapping>::const_iterator it =
accelerator_list.begin(); it != accelerator_list.end(); ++it) {
const AcceleratorMapping& entry = *it;
- acclerators.insert(entry);
+ accelerators.insert(entry);
}
for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i];
@@ -68,7 +68,7 @@ TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
entry.keycode = ash_entry.keycode;
entry.modifiers = ash_entry.modifiers;
entry.command_id = 0; // dummy
- EXPECT_TRUE(acclerators.insert(entry).second)
+ EXPECT_TRUE(accelerators.insert(entry).second)
<< "Duplicated accelerator: " << entry.keycode << ", "
<< (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
<< (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index e9d3be1..00e6641 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -392,7 +392,7 @@ void OmniboxViewViews::OnPaste() {
}
bool OmniboxViewViews::HandleEarlyTabActions(const ui::KeyEvent& event) {
- // This must run before acclerator handling invokes a focus change on tab.
+ // This must run before accelerator handling invokes a focus change on tab.
// Note the parallel with SkipDefaultKeyEventProcessing above.
if (!views::FocusManager::IsTabTraversalKeyEvent(event))
return false;
diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc
index 319b8b6..4e3f295 100644
--- a/chrome/browser/ui/views/panels/panel_view.cc
+++ b/chrome/browser/ui/views/panels/panel_view.cc
@@ -55,7 +55,7 @@ const int kStackedPanelHeightShrinkThresholdToBecomeMinimized =
#endif
// Supported accelerators.
-// Note: We can't use the acclerator table defined in chrome/browser/ui/views
+// Note: We can't use the accelerator table defined in chrome/browser/ui/views
// due to checkdeps violation.
struct AcceleratorMapping {
ui::KeyboardCode keycode;
diff --git a/ui/accelerometer/accelerometer_types.h b/ui/accelerometer/accelerometer_types.h
index 274c7c5..b3e513d 100644
--- a/ui/accelerometer/accelerometer_types.h
+++ b/ui/accelerometer/accelerometer_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_ACCEROMETER_ACCELEROMETER_TYPES_H_
-#define UI_ACCEROMETER_ACCELEROMETER_TYPES_H_
+#ifndef UI_ACCELEROMETER_ACCELEROMETER_TYPES_H_
+#define UI_ACCELEROMETER_ACCELEROMETER_TYPES_H_
#include "base/macros.h"
#include "ui/accelerometer/ui_accelerometer_export.h"
@@ -71,6 +71,6 @@ class UI_ACCELEROMETER_EXPORT AccelerometerUpdate {
DISALLOW_COPY_AND_ASSIGN(AccelerometerUpdate);
};
-} // namespace chromeos
+} // namespace ui
-#endif // UI_ACCEROMETER_ACCELEROMETER_TYPES_H_
+#endif // UI_ACCELEROMETER_ACCELEROMETER_TYPES_H_
diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h
index 0e33ad65..8398c8f 100644
--- a/ui/base/accelerators/accelerator_manager.h
+++ b/ui/base/accelerators/accelerator_manager.h
@@ -65,7 +65,7 @@ class UI_BASE_EXPORT AcceleratorManager {
// Returns the AcceleratorTarget that should be activated for the specified
// keyboard accelerator, or NULL if no view is registered for that keyboard
// accelerator.
- AcceleratorTarget* GetCurrentTarget(const Accelerator& accelertor) const;
+ AcceleratorTarget* GetCurrentTarget(const Accelerator& accelerator) const;
// Whether the given |accelerator| has a priority handler associated with it.
bool HasPriorityHandler(const Accelerator& accelerator) const;
diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index d0d3100..5b461cd 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.h
@@ -75,7 +75,7 @@ class UI_BASE_EXPORT MenuModel {
// If NULL, then the default font list should be used.
virtual const gfx::FontList* GetLabelFontListAt(int index) const;
- // Gets the acclerator information for the specified index, returning true if
+ // Gets the accelerator information for the specified index, returning true if
// there is a shortcut accelerator for the item, false otherwise.
virtual bool GetAcceleratorAt(int index,
ui::Accelerator* accelerator) const = 0;
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index bce8549..3ba730d 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -287,7 +287,7 @@ class VIEWS_EXPORT FocusManager {
// keyboard accelerator, or NULL if no view is registered for that keyboard
// accelerator.
ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
- const ui::Accelerator& accelertor) const;
+ const ui::Accelerator& accelerator) const;
// Whether the given |accelerator| has a priority handler associated with it.
bool HasPriorityHandler(const ui::Accelerator& accelerator) const;
generated by cgit v1.1 at 2025-01-11 19:59:55 +0000