summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 17:32:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 17:32:38 +0000
commit864876b53249e2c801b09e3a94f42b98019f2ba4 (patch)
tree566179967ccb846f53fb8c7bba683459e398c90d /views
parent17f3537c835337ec2f5e4269025c91f9b578bb04 (diff)
downloadchromium_src-864876b53249e2c801b09e3a94f42b98019f2ba4.zip
chromium_src-864876b53249e2c801b09e3a94f42b98019f2ba4.tar.gz
chromium_src-864876b53249e2c801b09e3a94f42b98019f2ba4.tar.bz2
views: Fix bad license headers found in some files
BUG=50266 TEST=None Review URL: http://codereview.chromium.org/3017036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/button/native_button_gtk.h13
-rw-r--r--views/controls/button/native_button_wrapper.h6
-rw-r--r--views/controls/button/radio_button.h10
-rw-r--r--views/controls/combobox/native_combobox_gtk.h6
-rw-r--r--views/controls/combobox/native_combobox_win.h6
-rw-r--r--views/controls/combobox/native_combobox_wrapper.h6
-rw-r--r--views/controls/native/native_view_host_wrapper.h6
-rw-r--r--views/controls/native_control_win.h6
-rw-r--r--views/controls/scrollbar/native_scroll_bar_wrapper.h11
-rw-r--r--views/controls/slider/native_slider_wrapper.h6
-rw-r--r--views/controls/table/native_table_gtk.h9
-rw-r--r--views/controls/table/native_table_wrapper.h6
-rw-r--r--views/views_delegate.h9
-rw-r--r--views/window/window.h8
14 files changed, 51 insertions, 57 deletions
diff --git a/views/controls/button/native_button_gtk.h b/views/controls/button/native_button_gtk.h
index a77ca49..2ae38b1 100644
--- a/views/controls/button/native_button_gtk.h
+++ b/views/controls/button/native_button_gtk.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_GTK_H_
#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_GTK_H_
@@ -41,12 +41,10 @@ class NativeButtonGtk : public NativeControlGtk, public NativeButtonWrapper {
// Invoked when the user clicks on the button.
virtual void OnClicked();
- protected:
// The NativeButton we are bound to.
NativeButton* native_button_;
private:
-
// The preferred size from the last size_request. We save this until we are
// notified that data may have caused the preferred size to change because
// otherwise it seems every time we call gtk_widget_size_request the size
@@ -78,7 +76,7 @@ class NativeCheckboxGtk : public NativeButtonGtk {
virtual void UpdateChecked();
virtual void UpdateDefault();
- // a flag to prevent OnClicked event when updating
+ // A flag to prevent OnClicked event when updating
// gtk control via API gtk_toggle_button_set_active.
bool deliver_click_event_;
@@ -111,7 +109,6 @@ class NativeRadioButtonGtk : public NativeCheckboxGtk {
DISALLOW_COPY_AND_ASSIGN(NativeRadioButtonGtk);
};
-
} // namespace views
-#endif // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_GTK_H_
+#endif // VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_GTK_H_
diff --git a/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h
index e8cbd99..01d9219 100644
--- a/views/controls/button/native_button_wrapper.h
+++ b/views/controls/button/native_button_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index d71ce4e..af7f902 100644
--- a/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
#define VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
@@ -39,13 +39,11 @@ class RadioButton : public Checkbox {
private:
friend class NativeRadioButtonGtk;
- // Accessor for |native_wrapper_|.
NativeButtonWrapper* native_wrapper() { return native_wrapper_; }
- private:
DISALLOW_COPY_AND_ASSIGN(RadioButton);
};
} // namespace views
-#endif // #ifndef VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
+#endif // VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
diff --git a/views/controls/combobox/native_combobox_gtk.h b/views/controls/combobox/native_combobox_gtk.h
index 8ed4bc0..56e8666 100644
--- a/views/controls/combobox/native_combobox_gtk.h
+++ b/views/controls/combobox/native_combobox_gtk.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_GTK_H_
diff --git a/views/controls/combobox/native_combobox_win.h b/views/controls/combobox/native_combobox_win.h
index a0a6292..287fdb0 100644
--- a/views/controls/combobox/native_combobox_win.h
+++ b/views/controls/combobox/native_combobox_win.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WIN_H_
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index 61a3075..a2d5352 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
#define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
diff --git a/views/controls/native/native_view_host_wrapper.h b/views/controls/native/native_view_host_wrapper.h
index 43e9869..1b06b3e 100644
--- a/views/controls/native/native_view_host_wrapper.h
+++ b/views/controls/native/native_view_host_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WRAPPER_H_
#define VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_WRAPPER_H_
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index 7a2ea64..1b0273b 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
#define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
diff --git a/views/controls/scrollbar/native_scroll_bar_wrapper.h b/views/controls/scrollbar/native_scroll_bar_wrapper.h
index 78126ac..fb92c3d 100644
--- a/views/controls/scrollbar/native_scroll_bar_wrapper.h
+++ b/views/controls/scrollbar/native_scroll_bar_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_NATIVE_SCROLL_BAR_WRAPPER_H_
#define VIEWS_CONTROLS_NATIVE_SCROLL_BAR_WRAPPER_H_
@@ -19,9 +19,7 @@ class NativeScrollBarWrapper {
// Updates the scroll bar appearance given a viewport size, content size and
// current position.
- virtual void Update(int viewport_size,
- int content_size,
- int current_pos) = 0;
+ virtual void Update(int viewport_size, int content_size, int current_pos) = 0;
// Retrieves the views::View that hosts the native control.
virtual View* GetView() = 0;
@@ -40,4 +38,3 @@ class NativeScrollBarWrapper {
} // namespace views
#endif // VIEWS_CONTROLS_NATIVE_SCROLL_BAR_WRAPPER_H_
-
diff --git a/views/controls/slider/native_slider_wrapper.h b/views/controls/slider/native_slider_wrapper.h
index d25235f..0c1d304 100644
--- a/views/controls/slider/native_slider_wrapper.h
+++ b/views/controls/slider/native_slider_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
#define VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
diff --git a/views/controls/table/native_table_gtk.h b/views/controls/table/native_table_gtk.h
index e927d60..8e51d01 100644
--- a/views/controls/table/native_table_gtk.h
+++ b/views/controls/table/native_table_gtk.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_TABLE_NATIVE_TABLE_GTK_H_
#define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_GTK_H_
@@ -16,7 +16,8 @@ namespace views {
class TableView2;
// A View that hosts a native GTK table.
-// Note that the implementation is still incomplete. What remains to be done:
+// TODO: Note that the implementation is still incomplete. What remains to be
+// done:
// - support resizable columns
// - support autosize columns
// - implement focus row methods.
diff --git a/views/controls/table/native_table_wrapper.h b/views/controls/table/native_table_wrapper.h
index a100572..8e9067cb 100644
--- a/views/controls/table/native_table_wrapper.h
+++ b/views/controls/table/native_table_wrapper.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_
#define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_
diff --git a/views/views_delegate.h b/views/views_delegate.h
index e817bbf..bc05b45 100644
--- a/views/views_delegate.h
+++ b/views/views_delegate.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_VIEWS_DELEGATE_H_
#define VIEWS_VIEWS_DELEGATE_H_
@@ -12,6 +12,7 @@
#endif
class Clipboard;
+
namespace gfx {
class Rect;
}
@@ -63,4 +64,4 @@ class ViewsDelegate {
} // namespace views
-#endif // #ifndef VIEWS_VIEWS_DELEGATE_H_
+#endif // VIEWS_VIEWS_DELEGATE_H_
diff --git a/views/window/window.h b/views/window/window.h
index c16cdaa..af1dc70 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
#ifndef VIEWS_WINDOW_WINDOW_H_
#define VIEWS_WINDOW_WINDOW_H_
@@ -12,7 +12,7 @@ namespace gfx {
class Font;
class Rect;
class Size;
-}
+} // namespace gfx
namespace views {