[MD] Don't use new OTR native-theming when using a custom browser theme.

chrome/browser/ui/views/frame/browser_root_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/browser_root_view.h"
 
 #include <cmath>
 
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/touch_uma/touch_uma.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/hit_test.h"
 
+#if defined(OS_LINUX)

[sky, 2016/01/27 03:07:31]

Do you really need these includes here?

[Evan Stade, 2016/01/28 00:08:44]

no, this is left over from a previous iteration of the patch. Removed.

+#include "ui/native_theme/native_theme_dark_aura.h"
+#endif
+
+#if defined(OS_WIN)
+#include "ui/native_theme/native_theme_dark_win.h"
+#endif
+
 // static
 const char BrowserRootView::kViewClassName[] =
     "browser/ui/views/frame/BrowserRootView";
 
 BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                  views::Widget* widget)
     : views::internal::RootView(widget),
       browser_view_(browser_view),
       forwarding_to_tab_strip_(false),
       scroll_remainder_x_(0),
@@ skipping 200 matching lines @@
       browser_view_->browser()->profile())->Classify(
           text, false, false, metrics::OmniboxEventProto::INVALID_SPEC, &match,
           nullptr);
   if (!match.destination_url.is_valid())
     return false;
 
   if (url)
     *url = match.destination_url;
   return true;
 }