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

chrome/browser/ui/views/toolbar_view.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/toolbar_view.h"
+#include "chrome/browser/ui/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/number_formatting.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
 #include "chrome/browser/background_page_tracker.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
@@ skipping 19 matching lines @@
 #include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/dom_ui/wrench_menu_ui.h"
 #include "views/controls/menu/menu_2.h"
 #endif
-#include "chrome/browser/views/wrench_menu.h"
+#include "chrome/browser/ui/views/wrench_menu.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 // The space between items is 4 px in general.
 const int ToolbarView::kStandardSpacing = 4;
 // The top of the toolbar has an edge we have to skip over in addition to the 4
 // px of spacing.
 const int ToolbarView::kVertSpacing = kStandardSpacing + 1;
@@ skipping 285 matching lines @@
 #endif
   wrench_menu_ = new WrenchMenu(browser_);
   wrench_menu_->Init(wrench_menu_model_.get());
 
   for (size_t i = 0; i < menu_listeners_.size(); ++i)
     menu_listeners_[i]->OnMenuOpened();
 
   wrench_menu_->RunMenu(app_menu_);
 
 #if defined(OS_CHROMEOS)
 cleanup:

[msw, 2011/01/10 00:38:29]

I got this pre-submit error:
/cygdrive/d/src/chrome-git/src/chrome/browser/ui/views/toolbar_view.cc:351: 
Labels should always be indented at least one space.  If this is a
member-initializer list in a constructor or the base class list in a class
definition, the colon should be on the following line.  [whitespace/labels] [4]

[Ben Goodger (Google), 2011/01/10 17:09:30]

Simple, just indent 1 space before cleanup:. e.g.

  int foo = 5;
  if (foo == 4)
    goto eek;
  ++foo;
 eek:
  LOG(WARNING) << foo;

[msw, 2011/01/10 17:54:01]

Done. The codebase has both, 1 and 0 spaces...

[Ben Goodger (Google), 2011/01/10 17:55:02]

According to the error then, the latter is wrong :-)

 #endif
   if (destroyed_flag)
     return;
   destroyed_flag_ = NULL;
 
   // Stop showing the background app badge also.
   BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 400 matching lines @@
   SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
   string16 badge_text = base::FormatNumber(
       BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
   return badge_util::DrawBadgeIconOverlay(
       *badge,
       kBadgeTextFontSize,
       badge_text,
       l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
 }