summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/accelerator.cc6
-rw-r--r--chrome/views/client_view.h2
-rw-r--r--chrome/views/dialog_client_view.h2
-rw-r--r--chrome/views/focus_manager.cc2
-rw-r--r--chrome/views/focus_manager_unittest.cc2
-rw-r--r--chrome/views/grid_layout.h2
-rw-r--r--chrome/views/hwnd_view.cc6
-rw-r--r--chrome/views/hwnd_view.h2
-rw-r--r--chrome/views/native_button.cc2
-rw-r--r--chrome/views/single_split_view.cc2
-rw-r--r--chrome/views/table_view_unittest.cc2
-rw-r--r--chrome/views/text_button.cc2
-rw-r--r--chrome/views/tree_view.cc2
-rw-r--r--chrome/views/view_unittest.cc6
-rw-r--r--chrome/views/window.cc2
-rw-r--r--chrome/views/window.h2
-rw-r--r--chrome/views/window_delegate.cc6
-rw-r--r--chrome/views/window_delegate.h2
18 files changed, 26 insertions, 26 deletions
diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc
index b86133f..1a70c44 100644
--- a/chrome/views/accelerator.cc
+++ b/chrome/views/accelerator.cc
@@ -53,16 +53,16 @@ std::wstring Accelerator::GetShortcutText() const {
std::wstring shortcut;
if (!string_id) {
- // Our fallback is to try translate the key code to a regular character
+ // Our fallback is to try translate the key code to a regular character
// unless it is one of digits (VK_0 to VK_9). Some keyboard
// layouts have characters other than digits assigned in
// an unshifted mode (e.g. French AZERY layout has 'a with grave
- // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
+ // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
// default zoom level), we leave VK_[0-9] alone without translation.
wchar_t key;
if (key_code_ >= '0' && key_code_ <= '9')
key = key_code_;
- else
+ else
key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
shortcut += key;
} else {
diff --git a/chrome/views/client_view.h b/chrome/views/client_view.h
index 919f661..d573039 100644
--- a/chrome/views/client_view.h
+++ b/chrome/views/client_view.h
@@ -42,7 +42,7 @@ class ClientView : public View {
// forwards the notification to the delegate.
virtual void WindowClosing();
- // Tests to see if the specified point (in view coordinates) is within the
+ // Tests to see if the specified point (in view coordinates) is within the
// bounds of this view. If so, it returns HTCLIENT in this default
// implementation. If it is outside the bounds of this view, this must return
// HTNOWHERE to tell the caller to do further processing to determine where
diff --git a/chrome/views/dialog_client_view.h b/chrome/views/dialog_client_view.h
index 32713d0..52862fb 100644
--- a/chrome/views/dialog_client_view.h
+++ b/chrome/views/dialog_client_view.h
@@ -97,7 +97,7 @@ class DialogClientView : public ClientView,
// The dialog buttons.
NativeButton* ok_button_;
NativeButton* cancel_button_;
-
+
// The button that is currently the default button if any.
NativeButton* default_button_;
diff --git a/chrome/views/focus_manager.cc b/chrome/views/focus_manager.cc
index 6dac309..093b0a4 100644
--- a/chrome/views/focus_manager.cc
+++ b/chrome/views/focus_manager.cc
@@ -744,7 +744,7 @@ void FocusManager::UnregisterAccelerator(const Accelerator& accelerator,
NOTREACHED() << "Unregistering non-existing accelerator";
return;
}
-
+
if (iter->second != target) {
NOTREACHED() << "Unregistering accelerator for wrong target";
return;
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index 30f7e85..edbb403 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -175,7 +175,7 @@ class TestViewWindow : public views::WidgetWin {
void Init();
views::View* contents() const { return contents_; }
-
+
// Return the ID of the component that currently has the focus.
int GetFocusedComponentID();
diff --git a/chrome/views/grid_layout.h b/chrome/views/grid_layout.h
index 358422a..27ccc3e 100644
--- a/chrome/views/grid_layout.h
+++ b/chrome/views/grid_layout.h
@@ -174,7 +174,7 @@ class GridLayout : public LayoutManager {
// they both call into this method. This sizes the Columns/Rows as
// appropriate. If layout is true, width/height give the width/height the
// of the host, otherwise they are ignored.
- void SizeRowsAndColumns(bool layout, int width, int height,
+ void SizeRowsAndColumns(bool layout, int width, int height,
gfx::Size* pref);
// Calculates the master columns of all the column sets. See Column for
diff --git a/chrome/views/hwnd_view.cc b/chrome/views/hwnd_view.cc
index e812a06..82ce224 100644
--- a/chrome/views/hwnd_view.cc
+++ b/chrome/views/hwnd_view.cc
@@ -176,9 +176,9 @@ void HWNDView::Focus() {
}
void HWNDView::Paint(ChromeCanvas* canvas) {
- // The area behind our window is black, so during a fast resize (where our
- // content doesn't draw over the full size of our HWND, and the HWND
- // background color doesn't show up), we need to cover that blackness with
+ // The area behind our window is black, so during a fast resize (where our
+ // content doesn't draw over the full size of our HWND, and the HWND
+ // background color doesn't show up), we need to cover that blackness with
// something so that fast resizes don't result in black flash.
//
// It would be nice if this used some approximation of the page's
diff --git a/chrome/views/hwnd_view.h b/chrome/views/hwnd_view.h
index ae33d0f..8219991 100644
--- a/chrome/views/hwnd_view.h
+++ b/chrome/views/hwnd_view.h
@@ -69,7 +69,7 @@ class HWNDView : public View {
// Notification that our visible bounds relative to the root has changed.
// This updates the bounds of the HWND.
virtual void VisibleBoundsInRootChanged();
-
+
virtual void Focus();
private:
diff --git a/chrome/views/native_button.cc b/chrome/views/native_button.cc
index d6db326..71ff637 100644
--- a/chrome/views/native_button.cc
+++ b/chrome/views/native_button.cc
@@ -14,7 +14,7 @@ namespace views {
const char NativeButton::kViewClassName[] = "chrome/views/NativeButton";
-NativeButton::NativeButton(const std::wstring& label)
+NativeButton::NativeButton(const std::wstring& label)
: enforce_dlu_min_size_(true) {
Init(label, false);
}
diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc
index a7832b6..845d980 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/single_split_view.cc
@@ -13,7 +13,7 @@ namespace views {
// Size of the divider in pixels.
static const int kDividerSize = 4;
-SingleSplitView::SingleSplitView(View* leading, View* trailing)
+SingleSplitView::SingleSplitView(View* leading, View* trailing)
: divider_x_(-1) {
AddChildView(leading);
AddChildView(trailing);
diff --git a/chrome/views/table_view_unittest.cc b/chrome/views/table_view_unittest.cc
index 9ef53da..41c985c 100644
--- a/chrome/views/table_view_unittest.cc
+++ b/chrome/views/table_view_unittest.cc
@@ -83,7 +83,7 @@ void TestTableModel::ChangeRow(int row, int c1_value, int c2_value) {
int TestTableModel::RowCount() {
return static_cast<int>(rows_.size());
}
-
+
std::wstring TestTableModel::GetText(int row, int column_id) {
return IntToWString(rows_[row][column_id]);
}
diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc
index ba4e3b2..1eca617 100644
--- a/chrome/views/text_button.cc
+++ b/chrome/views/text_button.cc
@@ -169,7 +169,7 @@ gfx::Size TextButton::GetPreferredSize() {
if (max_width_ > 0)
prefsize.set_width(std::min(max_width_, prefsize.width()));
-
+
return prefsize;
}
diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc
index 4e77db0..7166a31 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/tree_view.cc
@@ -487,7 +487,7 @@ void TreeView::OnContextMenu(const CPoint& location) {
NativeControl::OnContextMenu(location);
return;
}
-
+
if (show_context_menu_only_when_node_selected_) {
if (!GetSelectedNode())
return;
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index e26ff2f..feb9182 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_unittest.cc
@@ -27,7 +27,7 @@ class ViewTest : public testing::Test {
~ViewTest() {
OleUninitialize();
}
-
+
private:
MessageLoopForUI message_loop_;
};
@@ -592,7 +592,7 @@ class TestDialogView : public views::View,
public:
TestDialogView() {
}
-
+
// views::DialogDelegate implementation:
virtual int GetDialogButtons() const {
return DIALOGBUTTON_OK | DIALOGBUTTON_CANCEL;
@@ -658,4 +658,4 @@ TEST_F(ViewTest, DialogDefaultButtonTest) {
EXPECT_TRUE(cancel_button->IsDefaultButton());
EXPECT_FALSE(dialog_view_->button1_->IsDefaultButton());
EXPECT_FALSE(dialog_view_->button2_->IsDefaultButton());
-} \ No newline at end of file
+}
diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index 12f7d9a..1dcf75f 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -352,7 +352,7 @@ void Window::Init(HWND parent, const gfx::Rect& bounds) {
WidgetWin::Init(parent, bounds, true);
win_util::SetWindowUserData(GetHWND(), this);
-
+
// Create the ClientView, add it to the NonClientView and add the
// NonClientView to the RootView. This will cause everything to be parented.
non_client_view_->set_client_view(window_delegate_->CreateClientView(this));
diff --git a/chrome/views/window.h b/chrome/views/window.h
index 564cfab..089fea4 100644
--- a/chrome/views/window.h
+++ b/chrome/views/window.h
@@ -252,7 +252,7 @@ class Window : public WidgetWin,
enum ResizeCursor {
RC_NORMAL = 0, RC_VERTICAL, RC_HORIZONTAL, RC_NESW, RC_NWSE
};
- static HCURSOR resize_cursors_[6];
+ static HCURSOR resize_cursors_[6];
// Our window delegate (see Init method for documentation).
WindowDelegate* window_delegate_;
diff --git a/chrome/views/window_delegate.cc b/chrome/views/window_delegate.cc
index 171b642..e76330a 100644
--- a/chrome/views/window_delegate.cc
+++ b/chrome/views/window_delegate.cc
@@ -48,7 +48,7 @@ bool WindowDelegate::GetSavedWindowBounds(gfx::Rect* bounds) const {
if (window_name.empty())
return false;
- const DictionaryValue* dictionary =
+ const DictionaryValue* dictionary =
g_browser_process->local_state()->GetDictionary(window_name.c_str());
int left, top, right, bottom;
if (!dictionary || !dictionary->GetInteger(L"left", &left) ||
@@ -66,7 +66,7 @@ bool WindowDelegate::GetSavedMaximizedState(bool* maximized) const {
if (window_name.empty())
return false;
- const DictionaryValue* dictionary =
+ const DictionaryValue* dictionary =
g_browser_process->local_state()->GetDictionary(window_name.c_str());
return dictionary && dictionary->GetBoolean(L"maximized", maximized);
}
@@ -79,7 +79,7 @@ bool WindowDelegate::GetSavedAlwaysOnTopState(bool* always_on_top) const {
if (window_name.empty())
return false;
- const DictionaryValue* dictionary =
+ const DictionaryValue* dictionary =
g_browser_process->local_state()->GetDictionary(window_name.c_str());
return dictionary && dictionary->GetBoolean(L"always_on_top", always_on_top);
}
diff --git a/chrome/views/window_delegate.h b/chrome/views/window_delegate.h
index 8f60db4..7d0cb44 100644
--- a/chrome/views/window_delegate.h
+++ b/chrome/views/window_delegate.h
@@ -120,7 +120,7 @@ class WindowDelegate {
virtual bool GetSavedWindowBounds(gfx::Rect* bounds) const;
virtual bool GetSavedMaximizedState(bool* maximized) const;
virtual bool GetSavedAlwaysOnTopState(bool* always_on_top) const;
-
+
// Called when the window closes.
virtual void WindowClosing() { }
generated by cgit v1.1 at 2025-01-19 15:14:59 +0000