Move content_restriction.h and main_function_params.h to content/public/common, and put them in t...

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 131 matching lines @@
 #include "content/browser/download/save_package.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
-#include "content/common/content_restriction.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
+#include "content/public/common/content_restriction.h"
 #include "content/public/common/content_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/animation/animation.h"
@@ skipping 4555 matching lines @@
 #endif
 
   UpdateCommandsForContentRestrictionState();
   UpdateCommandsForBookmarkEditing();
 }
 
 void Browser::UpdateCommandsForContentRestrictionState() {
   int restrictions = GetContentRestrictionsForSelectedTab();
 
   command_updater_.UpdateCommandEnabled(
-      IDC_COPY, !(restrictions & CONTENT_RESTRICTION_COPY));
+      IDC_COPY, !(restrictions & content::CONTENT_RESTRICTION_COPY));
   command_updater_.UpdateCommandEnabled(
-      IDC_CUT, !(restrictions & CONTENT_RESTRICTION_CUT));
+      IDC_CUT, !(restrictions & content::CONTENT_RESTRICTION_CUT));
   command_updater_.UpdateCommandEnabled(
-      IDC_PASTE, !(restrictions & CONTENT_RESTRICTION_PASTE));
+      IDC_PASTE, !(restrictions & content::CONTENT_RESTRICTION_PASTE));
   UpdateSaveAsState(restrictions);
   UpdatePrintingState(restrictions);
 }
 
 void Browser::UpdatePrintingState(int content_restrictions) {
   bool print_enabled = true;
   bool advanced_print_enabled = true;
   if (g_browser_process->local_state()) {
     print_enabled =
         g_browser_process->local_state()->GetBoolean(prefs::kPrintingEnabled);
     advanced_print_enabled = print_enabled;
   }
   if (print_enabled) {
     // Do not print when a constrained window is showing. It's confusing.
     TabContentsWrapper* wrapper = GetSelectedTabContentsWrapper();
     bool has_constrained_window = (wrapper &&
         wrapper->constrained_window_tab_helper()->constrained_window_count());
     if (has_constrained_window ||
-        content_restrictions & CONTENT_RESTRICTION_PRINT) {
+        content_restrictions & content::CONTENT_RESTRICTION_PRINT) {
       print_enabled = false;
       advanced_print_enabled = false;
     }
 
     // The exception is print preview,
     // where advanced printing is always enabled.
     printing::PrintPreviewTabController* controller =
         printing::PrintPreviewTabController::GetInstance();
     if (controller &&
         wrapper &&
@@ skipping 45 matching lines @@
       !profile_->GetPrefs()->IsManagedPreference(prefs::kShowBookmarkBar) &&
       show_main_ui);
 }
 
 void Browser::MarkHomePageAsChanged(PrefService* pref_service) {
   pref_service->SetBoolean(prefs::kHomePageChanged, true);
   pref_service->ScheduleSavePersistentPrefs();
 }
 
 void Browser::UpdateSaveAsState(int content_restrictions) {
-  bool enabled = !(content_restrictions & CONTENT_RESTRICTION_SAVE);
+  bool enabled = !(content_restrictions & content::CONTENT_RESTRICTION_SAVE);
   PrefService* state = g_browser_process->local_state();
   if (state)
     enabled = enabled && state->GetBoolean(prefs::kAllowFileSelectionDialogs);
 
   command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE, enabled);
 }
 
 void Browser::UpdateOpenFileState() {
   bool enabled = true;
   PrefService* local_state = g_browser_process->local_state();
@@ skipping 545 matching lines @@
 }
 
 int Browser::GetContentRestrictionsForSelectedTab() {
   int content_restrictions = 0;
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     content_restrictions = current_tab->content_restrictions();
     NavigationEntry* active_entry = current_tab->controller().GetActiveEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
     if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL()))
-      content_restrictions |= CONTENT_RESTRICTION_SAVE;
+      content_restrictions |= content::CONTENT_RESTRICTION_SAVE;
   }
   return content_restrictions;
 }
 
 void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
   BookmarkBar::State state;
   // The bookmark bar is hidden in fullscreen mode, unless on the new tab page.
   if (browser_defaults::bookmarks_enabled &&
       profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) &&
       (!window_ || !window_->IsFullscreen())) {
@@ skipping 98 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }