Carnitas: Remove chrome/browser/views, update references.

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

 // Copyright (c) 2011 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/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
@@ skipping 65 matching lines @@
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "app/view_prop.h"
 #include "app/win/win_util.h"
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #elif defined(OS_LINUX)
-#include "chrome/browser/views/accelerator_table_gtk.h"
+#include "chrome/browser/ui/views/accelerator_table_gtk.h"
 #include "views/window/hit_test.h"
 #include "views/window/window_gtk.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
 #endif
 
 using base::TimeDelta;
 using views::ColumnSet;
@@ skipping 14 matching lines @@
 static const int kWindowBorderWidth = 5;
 
 // If not -1, windows are shown with this state.
 static int explicit_show_state = -1;
 
 // How round the 'new tab' style bookmarks bar is.
 static const int kNewtabBarRoundness = 5;
 // ------------
 
 // Returned from BrowserView::GetClassName.
-const char BrowserView::kViewClassName[] = "browser/views/BrowserView";
+const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
 
 #if defined(OS_CHROMEOS)
 // Get a normal browser window of given |profile| to use as dialog parent
 // if given |browser| is not one. Otherwise, returns browser window of
 // |browser|. If |profile| is NULL, |browser|'s profile is used to find the
 // normal browser.
 static gfx::NativeWindow GetNormalBrowserWindowForBrowser(Browser* browser,
                                                           Profile* profile) {
   if (browser->type() != Browser::TYPE_NORMAL) {
     Browser* normal_browser = BrowserList::FindBrowserWithType(
@@ skipping 2445 matching lines @@
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }