Improve some naming

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 598 matching lines @@
   ui::ThemeProvider* tp = GetThemeProvider();
   frame_background_->set_frame_color(GetFrameColor());
   frame_background_->set_theme_image(GetFrameImage());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // The window manager typically shows a gradient in the native title bar (when
   // the system title bar pref is set, or when maximized on Ubuntu). Hide the
   // gradient in the tab strip (by shifting it up vertically) to avoid a
   // double-gradient effect.
-  if (tp->UsingNativeTheme())
+  if (tp->UsingSystemTheme())
     frame_background_->set_maximized_top_inset(kGTKThemeCondensedFrameTopInset);
 #endif
 
   frame_background_->PaintMaximized(canvas, this);
 
   // TODO(jamescook): Migrate this into FrameBackground.
   if (!browser_view()->IsToolbarVisible()) {
     // There's no toolbar to edge the frame border, so we need to draw a bottom
     // edge.  The graphic we use for this has a built in client edge, so we clip
     // it off the bottom.
@@ skipping 202 matching lines @@
     color_id = is_incognito ?
                ThemeProperties::COLOR_FRAME_INCOGNITO :
                ThemeProperties::COLOR_FRAME;
   } else {
     color_id = is_incognito ?
                ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE :
                ThemeProperties::COLOR_FRAME_INACTIVE;
   }
 
   if (browser_view()->IsBrowserTypeNormal() ||
-      platform_observer_->IsUsingNativeTheme()) {
+      platform_observer_->IsUsingSystemTheme()) {
     return GetThemeProvider()->GetColor(color_id);
   }
 
   // Never theme app and popup windows unless the |platform_observer_|
   // requested an override.
   return ThemeProperties::GetDefaultColor(color_id);
 }
 
 gfx::ImageSkia* OpaqueBrowserFrameView::GetFrameImage() const {
   bool is_incognito = browser_view()->IsOffTheRecord();
   int resource_id;
   if (browser_view()->IsBrowserTypeNormal()) {
     if (ShouldPaintAsActive()) {
       resource_id = is_incognito ?
           IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME;
     } else {
       resource_id = is_incognito ?
           IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE;
     }
     return GetThemeProvider()->GetImageSkiaNamed(resource_id);
   }
   if (ShouldPaintAsActive()) {
     resource_id = is_incognito ?
         IDR_THEME_FRAME_INCOGNITO : IDR_FRAME;
   } else {
     resource_id = is_incognito ?
         IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE;
   }
 
-  if (platform_observer_->IsUsingNativeTheme()) {
-    // We want to use theme images provided by the platform theme when enabled,
+  if (platform_observer_->IsUsingSystemTheme()) {
+    // We want to use theme images provided by the system theme when enabled,
     // even if we are an app or popup window.
     return GetThemeProvider()->GetImageSkiaNamed(resource_id);
   }
 
   // Otherwise, never theme app and popup windows.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageSkiaNamed(chrome::MapThemeImage(
       chrome::GetHostDesktopTypeForNativeWindow(
           browser_view()->GetNativeWindow()),
       resource_id));
@@ skipping 12 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }