summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 21:19:25 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 21:19:25 +0000
commit7913d649127f4fcc5d13ea50d2fd91c20101c8bd (patch)
treefb1e5907b493fa67f91465eee21e30c073706f01 /ui
parent98599120c007644643d17674fcf75744d575fb8e (diff)
downloadchromium_src-7913d649127f4fcc5d13ea50d2fd91c20101c8bd.zip
chromium_src-7913d649127f4fcc5d13ea50d2fd91c20101c8bd.tar.gz
chromium_src-7913d649127f4fcc5d13ea50d2fd91c20101c8bd.tar.bz2
views/examples: Pure pedantic change.
No need of views:: while already inside views namespace. Using views:: is incosistent, as at other places in examples we don't use it. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10824016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/examples/content_client/examples_browser_main_parts.cc15
-rw-r--r--ui/views/examples/content_client/examples_browser_main_parts.h4
-rw-r--r--ui/views/examples/double_split_view_example.cc15
-rw-r--r--ui/views/examples/menu_example.cc4
-rw-r--r--ui/views/examples/slider_example.cc2
-rw-r--r--ui/views/examples/slider_example.h2
-rw-r--r--ui/views/examples/text_example.cc10
-rw-r--r--ui/views/examples/textfield_example.h6
-rw-r--r--ui/views/examples/tree_view_example.cc8
9 files changed, 33 insertions, 33 deletions
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc
index 6103dc2..f15f83d 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
@@ -32,15 +32,17 @@ namespace views {
namespace examples {
namespace {
-class ExamplesViewsDelegate : public views::TestViewsDelegate {
+
+class ExamplesViewsDelegate : public TestViewsDelegate {
public:
#if defined(USE_AURA)
- virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
- views::NativeWidgetAura* native_widget) OVERRIDE {
- return new views::DesktopNativeWidgetHelperAura(native_widget);
+ virtual NativeWidgetHelperAura* CreateNativeWidgetHelper(
+ NativeWidgetAura* native_widget) OVERRIDE {
+ return new DesktopNativeWidgetHelperAura(native_widget);
}
#endif
};
+
} // namespace
ExamplesBrowserMainParts::ExamplesBrowserMainParts(
@@ -60,8 +62,7 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
#endif
views_delegate_.reset(new ExamplesViewsDelegate);
- views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE,
- browser_context_.get());
+ ShowExamplesWindow(QUIT_ON_CLOSE, browser_context_.get());
}
void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
@@ -76,7 +77,7 @@ void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) {
// xxx: Hax here because this kills event handling.
#if !defined(USE_AURA)
- views::AcceleratorHandler accelerator_handler;
+ AcceleratorHandler accelerator_handler;
base::RunLoop run_loop(&accelerator_handler);
#else
base::RunLoop run_loop;
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views/examples/content_client/examples_browser_main_parts.h
index 67bc25e..ec76226 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.h
+++ b/ui/views/examples/content_client/examples_browser_main_parts.h
@@ -16,13 +16,13 @@ class StackingClient;
}
namespace content {
-
class ShellBrowserContext;
struct MainFunctionParams;
}
namespace views {
class ViewsDelegate;
+
namespace examples {
class ExamplesBrowserMainParts : public content::BrowserMainParts {
@@ -43,7 +43,7 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
private:
scoped_ptr<content::ShellBrowserContext> browser_context_;
- scoped_ptr<views::ViewsDelegate> views_delegate_;
+ scoped_ptr<ViewsDelegate> views_delegate_;
#if defined(USE_AURA)
scoped_ptr<aura::client::StackingClient> stacking_client_;
#endif
diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc
index 4620f72..2bac8e1 100644
--- a/ui/views/examples/double_split_view_example.cc
+++ b/ui/views/examples/double_split_view_example.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -7,17 +7,20 @@
#include "ui/views/controls/single_split_view.h"
#include "ui/views/layout/grid_layout.h"
+namespace views {
+namespace examples {
+
namespace {
// DoubleSplitViews's content, which draws gradient color on background.
-class SplittedView : public views::View {
+class SplittedView : public View {
public:
SplittedView();
virtual ~SplittedView();
void SetColor(SkColor from, SkColor to);
- // Overridden from views::View.
+ // Overridden from View.
virtual gfx::Size GetMinimumSize() OVERRIDE;
private:
@@ -32,8 +35,7 @@ SplittedView::~SplittedView() {
}
void SplittedView::SetColor(SkColor from, SkColor to) {
- set_background(
- views::Background::CreateVerticalGradientBackground(from, to));
+ set_background(Background::CreateVerticalGradientBackground(from, to));
}
gfx::Size SplittedView::GetMinimumSize() {
@@ -42,9 +44,6 @@ gfx::Size SplittedView::GetMinimumSize() {
} // namespace
-namespace views {
-namespace examples {
-
DoubleSplitViewExample::DoubleSplitViewExample()
: ExampleBase("Double Split View") {
}
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 7eb3fc4..b11e90c 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -190,8 +190,8 @@ void ExampleMenuButton::OnMenuButtonClicked(View* source,
menu_runner_.reset(new MenuRunner(menu_model_adapter.CreateMenu()));
if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(), this,
- gfx::Rect(point, gfx::Size()), views::MenuItemView::TOPRIGHT,
- views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
+ gfx::Rect(point, gfx::Size()), MenuItemView::TOPRIGHT,
+ MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
return;
}
diff --git a/ui/views/examples/slider_example.cc b/ui/views/examples/slider_example.cc
index e7d90a5..1c45a4b 100644
--- a/ui/views/examples/slider_example.cc
+++ b/ui/views/examples/slider_example.cc
@@ -36,7 +36,7 @@ void SliderExample::CreateExampleView(View* container) {
void SliderExample::SliderValueChanged(Slider* sender,
float value,
float old_value,
- views::SliderChangeReason reason) {
+ SliderChangeReason reason) {
label_->SetText(ASCIIToUTF16(base::StringPrintf("%.3lf", value)));
}
diff --git a/ui/views/examples/slider_example.h b/ui/views/examples/slider_example.h
index 25ca9eb..8e90939 100644
--- a/ui/views/examples/slider_example.h
+++ b/ui/views/examples/slider_example.h
@@ -28,7 +28,7 @@ class SliderExample : public ExampleBase, public SliderListener {
virtual void SliderValueChanged(Slider* sender,
float value,
float old_value,
- views::SliderChangeReason reason) OVERRIDE;
+ SliderChangeReason reason) OVERRIDE;
Slider* slider_;
Label* label_;
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index b5e3912..d8db070 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -14,6 +14,9 @@
#include "ui/views/layout/grid_layout.h"
#include "ui/views/view.h"
+namespace views {
+namespace examples {
+
namespace {
// Number of columns in the view layout.
@@ -73,7 +76,7 @@ const char* kVerticalAlignments[] = {
};
// Toggles bit |flag| on |flags| based on state of |checkbox|.
-void SetFlagFromCheckbox(views::Checkbox* checkbox, int* flags, int flag) {
+void SetFlagFromCheckbox(Checkbox* checkbox, int* flags, int flag) {
if (checkbox->checked())
*flags |= flag;
else
@@ -82,9 +85,6 @@ void SetFlagFromCheckbox(views::Checkbox* checkbox, int* flags, int flag) {
} // namespace
-namespace views {
-namespace examples {
-
// TextExample's content view, which is responsible for drawing a string with
// the specified style.
class TextExample::TextExampleView : public View {
@@ -202,7 +202,7 @@ Combobox* TextExample::AddCombobox(GridLayout* layout,
void TextExample::CreateExampleView(View* container) {
text_view_ = new TextExampleView;
- text_view_->set_border(views::Border::CreateSolidBorder(1, SK_ColorGRAY));
+ text_view_->set_border(Border::CreateSolidBorder(1, SK_ColorGRAY));
GridLayout* layout = new GridLayout(container);
container->SetLayoutManager(layout);
diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h
index cfa5634..ff75bf6 100644
--- a/ui/views/examples/textfield_example.h
+++ b/ui/views/examples/textfield_example.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -19,8 +19,8 @@ namespace examples {
// TextfieldExample mimics login screen.
class TextfieldExample : public ExampleBase,
- public views::TextfieldController,
- public views::ButtonListener {
+ public TextfieldController,
+ public ButtonListener {
public:
TextfieldExample();
virtual ~TextfieldExample();
diff --git a/ui/views/examples/tree_view_example.cc b/ui/views/examples/tree_view_example.cc
index 7ede122..3bdb447 100644
--- a/ui/views/examples/tree_view_example.cc
+++ b/ui/views/examples/tree_view_example.cc
@@ -128,11 +128,11 @@ void TreeViewExample::ShowContextMenuForView(View* source,
context_menu_model.AddItem(ID_EDIT, ASCIIToUTF16("Edit"));
context_menu_model.AddItem(ID_REMOVE, ASCIIToUTF16("Remove"));
context_menu_model.AddItem(ID_ADD, ASCIIToUTF16("Add"));
- views::MenuModelAdapter menu_adapter(&context_menu_model);
- context_menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu()));
+ MenuModelAdapter menu_adapter(&context_menu_model);
+ context_menu_runner_.reset(new MenuRunner(menu_adapter.CreateMenu()));
if (context_menu_runner_->RunMenuAt(source->GetWidget(), NULL,
- gfx::Rect(point, gfx::Size()), views::MenuItemView::TOPLEFT, 0) ==
- views::MenuRunner::MENU_DELETED)
+ gfx::Rect(point, gfx::Size()), MenuItemView::TOPLEFT, 0) ==
+ MenuRunner::MENU_DELETED)
return;
}