diff --git a/atom/browser/ui/views/frameless_view.cc b/atom/browser/ui/views/frameless_view.cc index 579419659a..7425c8093d 100644 --- a/atom/browser/ui/views/frameless_view.cc +++ b/atom/browser/ui/views/frameless_view.cc @@ -17,10 +17,11 @@ namespace { const int kResizeInsideBoundsSize = 5; const int kResizeAreaCornerSize = 16; -const char kViewClassName[] = "FramelessView"; - } // namespace +// static +const char FramelessView::kViewClassName[] = "FramelessView"; + FramelessView::FramelessView() : window_(NULL), frame_(NULL) {} FramelessView::~FramelessView() {} diff --git a/atom/browser/ui/views/frameless_view.h b/atom/browser/ui/views/frameless_view.h index 360b5bea97..28d70e94c5 100644 --- a/atom/browser/ui/views/frameless_view.h +++ b/atom/browser/ui/views/frameless_view.h @@ -17,6 +17,7 @@ class NativeWindowViews; class FramelessView : public views::NonClientFrameView { public: + static const char kViewClassName[]; FramelessView(); ~FramelessView() override; diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc index 66ad0edede..02fbc49bef 100644 --- a/atom/browser/ui/views/menu_bar.cc +++ b/atom/browser/ui/views/menu_bar.cc @@ -18,13 +18,13 @@ namespace atom { namespace { -const char kViewClassName[] = "ElectronMenuBar"; - // Default color of the menu bar. const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233); } // namespace +const char MenuBar::kViewClassName[] = "ElectronMenuBar"; + MenuBar::MenuBar(views::View* window) : background_color_(kDefaultColor), menu_model_(NULL), window_(window) { RefreshColorCache(); diff --git a/atom/browser/ui/views/menu_bar.h b/atom/browser/ui/views/menu_bar.h index c105b20023..4823954a8f 100644 --- a/atom/browser/ui/views/menu_bar.h +++ b/atom/browser/ui/views/menu_bar.h @@ -22,6 +22,8 @@ class MenuBar : public views::View, public views::MenuButtonListener, public views::FocusChangeListener { public: + static const char kViewClassName[]; + explicit MenuBar(views::View* window); virtual ~MenuBar(); diff --git a/atom/browser/ui/views/native_frame_view.cc b/atom/browser/ui/views/native_frame_view.cc index aef66b949d..2501373851 100644 --- a/atom/browser/ui/views/native_frame_view.cc +++ b/atom/browser/ui/views/native_frame_view.cc @@ -8,11 +8,7 @@ namespace atom { -namespace { - -const char kViewClassName[] = "AtomNativeFrameView"; - -} // namespace +const char NativeFrameView::kViewClassName[] = "AtomNativeFrameView"; NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget) : views::NativeFrameView(widget), window_(window) {} diff --git a/atom/browser/ui/views/native_frame_view.h b/atom/browser/ui/views/native_frame_view.h index 670459f1cb..22aa0ff94e 100644 --- a/atom/browser/ui/views/native_frame_view.h +++ b/atom/browser/ui/views/native_frame_view.h @@ -15,6 +15,7 @@ class NativeWindow; // NativeWindowViews. class NativeFrameView : public views::NativeFrameView { public: + static const char kViewClassName[]; NativeFrameView(NativeWindow* window, views::Widget* widget); protected: diff --git a/atom/browser/ui/x/window_state_watcher.cc b/atom/browser/ui/x/window_state_watcher.cc index e0fbf2a3ab..4aec37cd6a 100644 --- a/atom/browser/ui/x/window_state_watcher.cc +++ b/atom/browser/ui/x/window_state_watcher.cc @@ -11,15 +11,6 @@ namespace atom { -namespace { - -const char* kAtomsToCache[] = { - "_NET_WM_STATE", - NULL, -}; - -} // namespace - WindowStateWatcher::WindowStateWatcher(NativeWindowViews* window) : window_(window), widget_(window->GetAcceleratedWidget()), diff --git a/atom/common/crash_reporter/crash_reporter_linux.cc b/atom/common/crash_reporter/crash_reporter_linux.cc index fee322a95b..398613335e 100644 --- a/atom/common/crash_reporter/crash_reporter_linux.cc +++ b/atom/common/crash_reporter/crash_reporter_linux.cc @@ -28,8 +28,6 @@ namespace crash_reporter { namespace { -static const size_t kDistroSize = 128; - // Define a preferred limit on minidump sizes, because Crash Server currently // throws away any larger than 1.2MB (1.2 * 1024 * 1024). A value of -1 means // no limit.